From: Chris Lattner <sabre@nondot.org>
Date: Tue, 3 Nov 2009 16:50:11 +0000 (+0000)
Subject: fix a subtle bug I introduced when refactoring SCCP.  Testcase
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c175e5de2dbb04e835b13f0554a7ba2f25ba4fc3;p=oota-llvm.git

fix a subtle bug I introduced when refactoring SCCP.  Testcase
to follow.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85903 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp
index fb6101b0b99..2ee4bbc95b1 100644
--- a/lib/Transforms/Scalar/SCCP.cpp
+++ b/lib/Transforms/Scalar/SCCP.cpp
@@ -107,7 +107,7 @@ public:
 
   /// markConstant - Return true if this is a change in status.
   bool markConstant(Constant *V) {
-    if (isConstant()) {
+    if (getLatticeValue() == constant) { // Constant but not forcedconstant.
       assert(getConstant() == V && "Marking constant with different value");
       return false;
     }