diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2014-02-02 05:26:43 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2014-02-02 05:26:43 +0000 |
| commit | 3e3305dabaa26116be315cc758fc4d9ec3a7aba1 (patch) | |
| tree | 143b54ce4f56c6065ecc2234f25597574fb992bf /clang/lib/AST/Expr.cpp | |
| parent | 17455633c77d7bbdf7eaec852a4b6daef54b5f7f (diff) | |
| download | bcm5719-llvm-3e3305dabaa26116be315cc758fc4d9ec3a7aba1.tar.gz bcm5719-llvm-3e3305dabaa26116be315cc758fc4d9ec3a7aba1.zip | |
[Sema] Follow-up on r200521 for the -Wnon-literal-null-conversion warning and revert its behavior for C++.
llvm-svn: 200622
Diffstat (limited to 'clang/lib/AST/Expr.cpp')
| -rw-r--r-- | clang/lib/AST/Expr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp index e4b670dae7a..c921129261a 100644 --- a/clang/lib/AST/Expr.cpp +++ b/clang/lib/AST/Expr.cpp @@ -3061,6 +3061,9 @@ Expr::isNullPointerConstant(ASTContext &Ctx, Pointee->isVoidType() && // to void* CE->getSubExpr()->getType()->isIntegerType()) // from int. return CE->getSubExpr()->isNullPointerConstant(Ctx, NPC); + // Or an integer cast. + } else if (CE->getType()->isIntegerType()) { + return CE->getSubExpr()->isNullPointerConstant(Ctx, NPC); } } } else if (const ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(this)) { |
