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

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

LiveIntervalAnalysis.cpp updated: 1.184 -> 1.185
---
Log message:

Correct fix for a crasher on functions with live in values


---
Diffs of the changes:  (+6 -4)

 LiveIntervalAnalysis.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.184 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.185
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.184	Mon Sep  4 13:20:15 2006
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Mon Sep  4 13:27:40 2006
@@ -613,15 +613,17 @@
     DEBUG(std::cerr << ((Value*)mbb->getBasicBlock())->getName() << ":\n");
 
     MachineBasicBlock::iterator mi = mbb->begin(), miEnd = mbb->end();
-    if (IgnoreFirstInstr) { ++mi; IgnoreFirstInstr = false; }
+    if (IgnoreFirstInstr) {
+      ++mi;
+      IgnoreFirstInstr = false;
+      MIIndex += InstrSlots::NUM;
+    }
+    
     for (; mi != miEnd; ++mi) {
       const TargetInstrDescriptor& tid =
         tm_->getInstrInfo()->get(mi->getOpcode());
       DEBUG(std::cerr << MIIndex << "\t" << *mi);
 
-      // FIXME: Why is  this needed?
-      MIIndex = getInstructionIndex(mi);
-      
       // handle implicit defs
       if (tid.ImplicitDefs) {
         for (const unsigned* id = tid.ImplicitDefs; *id; ++id)