fix folding of comma if given a non-constant operand.
Eli please take a look, as I'm not sure if this gets the extension warning in the right place
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59422 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index bedc78c..0ffbf58 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -517,16 +517,17 @@
// Evaluate the side that actually matters; this needs to be
// handled specially because calling Visit() on the LHS can
// have strange results when it doesn't have an integral type.
- Visit(E->getRHS());
+ if (Visit(E->getRHS()))
+ return true;
// Check for isEvaluated; the idea is that this might eventually
// be useful for isICE and other similar uses that care about
// whether a comma is evaluated. This isn't really used yet, though,
// and I'm not sure it really works as intended.
if (!Info.isEvaluated)
- return true;
+ return Extension(E->getOperatorLoc(), diag::ext_comma_in_constant_expr);
- return Extension(E->getOperatorLoc(), diag::ext_comma_in_constant_expr);
+ return false;
}
if (E->isLogicalOp()) {