summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/AST/ExprConstant.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index 727678662db..07f6c5476d0 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -730,11 +730,11 @@ bool IntExprEvaluator::VisitBinaryOperator(const BinaryOperator *E) {
}
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
OpenPOWER on IntegriCloud