diff options
| -rw-r--r-- | AST/Expr.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/AST/Expr.cpp b/AST/Expr.cpp index 69ea9442ff..0b284a8a3f 100644 --- a/AST/Expr.cpp +++ b/AST/Expr.cpp @@ -648,13 +648,8 @@ bool Expr::isNullPointerConstant(ASTContext &Ctx) const { return CE->getSubExpr()->isNullPointerConstant(Ctx); } } else if (const ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(this)) { - // Check that it is a cast to void*. - if (const PointerType *PT = dyn_cast<PointerType>(ICE->getType())) { - QualType Pointee = PT->getPointeeType(); - if (Pointee.getQualifiers() == 0 && Pointee->isVoidType() && // to void* - ICE->getSubExpr()->getType()->isIntegerType()) // from int. - return ICE->getSubExpr()->isNullPointerConstant(Ctx); - } + // Ignore the ImplicitCastExpr type entirely. + return ICE->getSubExpr()->isNullPointerConstant(Ctx); } else if (const ParenExpr *PE = dyn_cast<ParenExpr>(this)) { // Accept ((void*)0) as a null pointer constant, as many other // implementations do. |