[llvm-commits] CVS: llvm/lib/CodeGen/LiveVariables.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

LiveVariables.cpp updated: 1.25 -> 1.26

---
Log message:

Fix an iterator invalidation problem.  :(


---
Diffs of the changes:  (+11 -2)

Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.25 llvm/lib/CodeGen/LiveVariables.cpp:1.26
--- llvm/lib/CodeGen/LiveVariables.cpp:1.25	Thu Feb 19 12:28:02 2004
+++ llvm/lib/CodeGen/LiveVariables.cpp	Thu Feb 19 12:32:29 2004
@@ -337,13 +337,22 @@
   // Move the killed information over...
   killed_iterator I, E;
   tie(I, E) = killed_range(OldMI);
+  std::vector<unsigned> Regs;
   for (killed_iterator A = I; A != E; ++A)
-    RegistersKilled.insert(std::make_pair(NewMI, A->second));
+    Regs.push_back(A->second);
   RegistersKilled.erase(I, E);
 
+  for (unsigned i = 0, e = Regs.size(); i != e; ++i)
+    RegistersKilled.insert(std::make_pair(NewMI, Regs[i]));
+  Regs.clear();
+
+
   // Move the dead information over...
   tie(I, E) = dead_range(OldMI);
   for (killed_iterator A = I; A != E; ++A)
-    RegistersDead.insert(std::make_pair(NewMI, A->second));
+    Regs.push_back(A->second);
   RegistersDead.erase(I, E);
+
+  for (unsigned i = 0, e = Regs.size(); i != e; ++i)
+    RegistersDead.insert(std::make_pair(NewMI, Regs[i]));
 }