From: Nuno Lopes <nunoplopes@sapo.pt>
Date: Sun, 16 Nov 2008 22:06:39 +0000 (+0000)
Subject: use HandleConversionToBool() to check if a given cond is foldable (per Eli's comment)
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a25bd55e63b9ab26ca69390533356aaae7f1a40e;p=clang

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 727678662d..07f6c5476d 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/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