diff options
| author | Mike Stump <mrs@apple.com> | 2009-11-17 00:45:21 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@apple.com> | 2009-11-17 00:45:21 +0000 |
| commit | db519a4bb2082b98e03162ac1a4399978833643b (patch) | |
| tree | 0887ccb3527cd027d12dc0ae51c367ea3791e6ad | |
| parent | a661bee756bf0c0ca1d42377c6f7b0936d171f48 (diff) | |
Ensure we peer through () when handling typeid(*p).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@89015 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/CGCXXExpr.cpp | 2 | ||||
| -rw-r--r-- | test/CodeGenCXX/rtti.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGCXXExpr.cpp b/lib/CodeGen/CGCXXExpr.cpp index eff432a05c..75740af074 100644 --- a/lib/CodeGen/CGCXXExpr.cpp +++ b/lib/CodeGen/CGCXXExpr.cpp @@ -372,7 +372,7 @@ llvm::Value * CodeGenFunction::EmitCXXTypeidExpr(const CXXTypeidExpr *E) { // We need to do a zero check for *p, unless it has NonNullAttr. // FIXME: PointerType->hasAttr<NonNullAttr>() bool CanBeZero = false; - if (UnaryOperator *UO = dyn_cast<UnaryOperator>(subE)) + if (UnaryOperator *UO = dyn_cast<UnaryOperator>(subE->IgnoreParens())) if (UO->getOpcode() == UnaryOperator::Deref) CanBeZero = true; if (CanBeZero) { diff --git a/test/CodeGenCXX/rtti.cpp b/test/CodeGenCXX/rtti.cpp index 49dcbe3f77..76f571ede2 100644 --- a/test/CodeGenCXX/rtti.cpp +++ b/test/CodeGenCXX/rtti.cpp @@ -102,7 +102,7 @@ void test2_2(test1_D *dp) { test2_1(); if (typeid(NP) == typeid(test1_D)) test2_1(); - if (typeid(*dp) == typeid(test1_D)) + if (typeid(((*(dp)))) == typeid(test1_D)) test2_1(); } |