From ef5a66d8171eb95e948107f8ee7707b360aaff25 Mon Sep 17 00:00:00 2001
From: Anders Carlsson <andersca@mac.com>
Date: Sat, 22 Nov 2008 22:32:07 +0000
Subject: [PATCH] An expression is not foldable if it can't be fully evaluated.
Fixes PR3060
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59887 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/CodeGen/CodeGenFunction.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp
index b358993665d..b56b050c144 100644
--- a/lib/CodeGen/CodeGenFunction.cpp
+++ b/lib/CodeGen/CodeGenFunction.cpp
@@ -197,8 +197,10 @@ int CodeGenFunction::ConstantFoldsToSimpleInteger(const Expr *Cond) {
// FIXME: Rename and handle conversion of other evaluatable things
// to bool.
- if (!Cond->Evaluate(V, getContext()) || !V.isInt())
- return 0; // Not foldable or not integer.
+ bool isEvaluated;
+ if (!Cond->Evaluate(V, getContext(), &isEvaluated) || !V.isInt() ||
+ !isEvaluated)
+ return 0; // Not foldable, not integer or not fully evaluatable.
if (CodeGenFunction::ContainsLabel(Cond))
return 0; // Contains a label.
--
GitLab