Apply final part of Chris' patch.

llvm-svn: 11040

1 files changed, 9 insertions, 11 deletions

diff --git a/llvm/lib/CodeGen/LiveIntervals.cpp b/llvm/lib/CodeGen/LiveIntervals.cpp
index a762ede860c..2eb9626abed 100644
--- a/llvm/lib/CodeGen/LiveIntervals.cpp
+++ b/llvm/lib/CodeGen/LiveIntervals.cpp
@@ -168,17 +168,15 @@ void LiveIntervals::handleVirtualRegisterDef(MachineBasicBlock* mbb,
         interval = &*r2iit->second;
     }
 
-    for (MbbIndex2MbbMap::iterator
-             it = mbbi2mbbMap_.begin(), itEnd = mbbi2mbbMap_.end();
-         it != itEnd; ++it) {
-        unsigned liveBlockIndex = it->first;
-        MachineBasicBlock* liveBlock = it->second;
-        if (liveBlockIndex < vi.AliveBlocks.size() &&
-            vi.AliveBlocks[liveBlockIndex] &&
-            !liveBlock->empty()) {
-            unsigned start =  getInstructionIndex(liveBlock->front());
-            unsigned end = getInstructionIndex(liveBlock->back()) + 1;
-            interval->addRange(start, end);
+    // iterate over all of the blocks that the variable is completely
+    // live in, adding them to the live interval
+    for (unsigned i = 0, e = vi.AliveBlocks.size(); i != e; ++i) {
+        if (vi.AliveBlocks[i]) {
+            MachineBasicBlock* mbb = lv_->getIndexMachineBasicBlock(i);
+            if (!mbb->empty()) {
+                interval->addRange(getInstructionIndex(mbb->front()),
+                                   getInstructionIndex(mbb->back()) + 1);
+            }
         }
     }