From: Chris Lattner <sabre@nondot.org>
Date: Wed, 4 Nov 2009 18:57:42 +0000 (+0000)
Subject: Fix an iterator invalidation bug that happens when a hashtable
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0fb7e18edd49f8df705a27e789eb925e18d4f44e;p=oota-llvm.git

Fix an iterator invalidation bug that happens when a hashtable
resizes in IPSCCP.  This fixes PR5394.


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

diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp
index 05a0eeef2d3..d515c130e99 100644
--- a/lib/Transforms/Scalar/SCCP.cpp
+++ b/lib/Transforms/Scalar/SCCP.cpp
@@ -1280,9 +1280,10 @@ CallOverdefined:
       }
       
       if (const StructType *STy = dyn_cast<StructType>(AI->getType())) {
-        for (unsigned i = 0, e = STy->getNumElements(); i != e; ++i)
-          mergeInValue(getStructValueState(AI, i), AI,
-                       getStructValueState(*CAI, i));
+        for (unsigned i = 0, e = STy->getNumElements(); i != e; ++i) {
+          LatticeVal CallArg = getStructValueState(*CAI, i);
+          mergeInValue(getStructValueState(AI, i), AI, CallArg);
+        }
       } else {
         mergeInValue(AI, getValueState(*CAI));
       }