use HandleConversionToBool() to check if a given cond is foldable (per Eli's comment)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59429 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index 7276786..07f6c54 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -730,11 +730,11 @@
}
bool IntExprEvaluator::VisitConditionalOperator(const ConditionalOperator *E) {
- llvm::APSInt Cond(32);
- if (!EvaluateInteger(E->getCond(), Cond, Info))
+ bool Cond;
+ if (!HandleConversionToBool(E->getCond(), Cond, Info))
return false;
- return Visit(Cond != 0 ? E->getTrueExpr() : E->getFalseExpr());
+ return Visit(Cond ? E->getTrueExpr() : E->getFalseExpr());
}
/// VisitSizeAlignOfExpr - Evaluate a sizeof or alignof with a result as the