Minor tweak plus a couple of FIXMEs.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54119 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 6b33bb6..adc52e2 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -169,7 +169,7 @@
return APValue();
}
- if (SubExpr->getType()->isArithmeticType()) {
+ if (SubExpr->getType()->isIntegralType()) {
llvm::APSInt Result(32);
if (EvaluateInteger(SubExpr, Result, Info)) {
Result.extOrTrunc((unsigned)Info.Ctx.getTypeSize(E->getType()));
@@ -302,7 +302,12 @@
if ((E->getOpcode() == BinaryOperator::LAnd && Result == 0) ||
(E->getOpcode() == BinaryOperator::LOr && Result != 0))
Info.isEvaluated = false;
-
+
+ // FIXME: Handle pointer subtraction
+
+ // FIXME Maybe we want to succeed even where we can't evaluate the
+ // right side of LAnd/LOr?
+ // For example, see http://llvm.org/bugs/show_bug.cgi?id=2525
if (!EvaluateInteger(E->getRHS(), RHS, Info))
return false;
Info.isEvaluated = OldEval;