From: Owen Anderson <resistor@mac.com>
Date: Tue, 22 Jan 2008 23:58:54 +0000 (+0000)
Subject: Fix an iterator invalidation issue.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=97ca75e4bbab7f680564c96e6a326cd1ea267ce2;p=oota-llvm.git

Fix an iterator invalidation issue.


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

diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp
index 5b80b94f3fc..cdf827d50e6 100644
--- a/lib/CodeGen/StrongPHIElimination.cpp
+++ b/lib/CodeGen/StrongPHIElimination.cpp
@@ -751,11 +751,17 @@ bool StrongPHIElimination::runOnMachineFunction(MachineFunction &Fn) {
   // FIXME: Insert last-minute copies
   
   // Remove PHIs
-  for (MachineFunction::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)
+  std::vector<MachineInstr*> phis;
+  for (MachineFunction::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) {
     for (MachineBasicBlock::iterator BI = I->begin(), BE = I->end();
          BI != BE; ++BI)
       if (BI->getOpcode() == TargetInstrInfo::PHI)
-        BI->eraseFromParent();
+        phis.push_back(BI);
+  }
+  
+  for (std::vector<MachineInstr*>::iterator I = phis.begin(), E = phis.end();
+       I != E; ++I)
+    (*I)->eraseFromParent();
   
   return false;
 }