diff options
| -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(); } |