Change isNullPointerConstant to be strict; hopefully this won't cause
any issues now that we have our own tgmath.h.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70090 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 970d295..f9ca323 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1374,12 +1374,8 @@
// If we have an integer constant expression, we need to *evaluate* it and
// test for the value 0.
- // FIXME: We should probably return false if we're compiling in strict mode
- // and Diag is not null (this indicates that the value was foldable but not
- // an ICE.
- EvalResult Result;
- return Evaluate(Result, Ctx) && !Result.HasSideEffects &&
- Result.Val.isInt() && Result.Val.getInt() == 0;
+ llvm::APSInt Result;
+ return isIntegerConstantExpr(Result, Ctx) && Result == 0;
}
/// isBitField - Return true if this expression is a bit-field.