Make Sema::CheckForConstantInitializer use Expr::Evaluate. This fixes PR3130.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60580 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 65abc36..4113075 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1651,8 +1651,13 @@
}
bool Sema::CheckForConstantInitializer(Expr *Init, QualType DclT) {
+ Expr::EvalResult Result;
+
Init = Init->IgnoreParens();
+ if (Init->Evaluate(Result, Context) && !Result.HasSideEffects)
+ return false;
+
// Look through CXXDefaultArgExprs; they have no meaning in this context.
if (CXXDefaultArgExpr* DAE = dyn_cast<CXXDefaultArgExpr>(Init))
return CheckForConstantInitializer(DAE->getExpr(), DclT);
@@ -1672,6 +1677,9 @@
return false;
}
+ // FIXME: We can probably remove some of this code below, now that
+ // Expr::Evaluate is doing the heavy lifting for scalars.
+
if (Init->isNullPointerConstant(Context))
return false;
if (Init->getType()->isArithmeticType()) {