From 1eed04d1fbac4d81b66a0651d33152bb0ee5fa73 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Mon, 4 Sep 2006 18:27:40 +0000
Subject: [PATCH] Correct fix for a crasher on functions with live in values

llvm-svn: 30099
---
 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
index 12b967ba6822..5bc03bc9576c 100644
--- a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -613,15 +613,17 @@ void LiveIntervals::computeIntervals() {
     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)