From 88499a35036cf5a5351b8f50dbc061348f308b53 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Fri, 25 Jul 2008 21:07:13 +0000 Subject: [PATCH] Properly remap live ranges whose end indices are the end of the function. llvm-svn: 54061 --- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp index 9bd003724456..833cb95eb9f3 100644 --- a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -168,8 +168,12 @@ void LiveIntervals::computeNumbering() { LI->end = getMBBEndIdx(J->second) + 1; } else { unsigned idx = index; - while (!OldI2MI[index]) ++index; - LI->end = mi2iMap_[OldI2MI[index]] + (idx == index ? offset : 0); + while (index < OldI2MI.size() && !OldI2MI[index]) ++index; + + if (index != OldI2MI.size()) + LI->end = mi2iMap_[OldI2MI[index]] + (idx == index ? offset : 0); + else + LI->end = InstrSlots::NUM * i2miMap_.size(); } // Remap the VNInfo def index, which works the same as the @@ -208,8 +212,13 @@ void LiveIntervals::computeNumbering() { } else { unsigned idx = index; while (!OldI2MI[index]) ++index; - vni->kills[i] = mi2iMap_[OldI2MI[index]] + - (idx == index ? offset : 0); + while (index < OldI2MI.size() && !OldI2MI[index]) ++index; + + if (index != OldI2MI.size()) + vni->kills[i] = mi2iMap_[OldI2MI[index]] + + (idx == index ? offset : 0); + else + vni->kills[i] = InstrSlots::NUM * i2miMap_.size(); } } }