diff options
| -rw-r--r-- | clang/AST/Expr.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Sema/conditional-expr.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/clang/AST/Expr.cpp b/clang/AST/Expr.cpp index c7a2005bc8f..f4da0f07516 100644 --- a/clang/AST/Expr.cpp +++ b/clang/AST/Expr.cpp @@ -995,7 +995,7 @@ bool Expr::isNullPointerConstant(ASTContext &Ctx) const { // Strip off a cast to void*, if it exists. if (const CastExpr *CE = dyn_cast<CastExpr>(this)) { // Check that it is a cast to void*. - if (const PointerType *PT = dyn_cast<PointerType>(CE->getType())) { + if (const PointerType *PT = CE->getType()->getAsPointerType()) { QualType Pointee = PT->getPointeeType(); if (Pointee.getQualifiers() == 0 && Pointee->isVoidType() && // to void* CE->getSubExpr()->getType()->isIntegerType()) // from int. diff --git a/clang/test/Sema/conditional-expr.c b/clang/test/Sema/conditional-expr.c index 813aaee9d0d..a21914c6d5c 100644 --- a/clang/test/Sema/conditional-expr.c +++ b/clang/test/Sema/conditional-expr.c @@ -31,5 +31,8 @@ void foo() { enum {xxx,yyy,zzz} e, *ee; short x; ee = ee ? &x : ee ? &i : &e; // expected-warning {{pointer type mismatch}} + + typedef void *asdf; + *(0 ? (asdf) 0 : &x) = 10; } |
