From: Cameron Zwarich Date: Tue, 12 Feb 2013 03:49:22 +0000 (+0000) Subject: Renumber SlotIndexes locally when a new block is inserted. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d7a4e0c9c37ff23d4a4d3876d125c021f73f73a;p=platform%2Fupstream%2Fllvm.git Renumber SlotIndexes locally when a new block is inserted. llvm-svn: 174937 --- diff --git a/llvm/include/llvm/CodeGen/SlotIndexes.h b/llvm/include/llvm/CodeGen/SlotIndexes.h index d4e8c20..76c1cea 100644 --- a/llvm/include/llvm/CodeGen/SlotIndexes.h +++ b/llvm/include/llvm/CodeGen/SlotIndexes.h @@ -605,14 +605,15 @@ namespace llvm { IndexListEntry *startEntry = 0; IndexListEntry *endEntry = 0; + IndexList::iterator newItr; if (nextMBB == mbb->getParent()->end()) { startEntry = &indexList.back(); endEntry = createEntry(0, 0); - indexList.insertAfter(startEntry, endEntry); + newItr = indexList.insertAfter(startEntry, endEntry); } else { startEntry = createEntry(0, 0); endEntry = getMBBStartIdx(nextMBB).listEntry(); - indexList.insert(endEntry, startEntry); + newItr = indexList.insert(endEntry, startEntry); } SlotIndex startIdx(startEntry, SlotIndex::Slot_Block); @@ -629,9 +630,7 @@ namespace llvm { MBBRanges.push_back(std::make_pair(startIdx, endIdx)); idx2MBBMap.push_back(IdxMBBPair(startIdx, mbb)); - // FIXME: Renumber locally instead of renumbering the whole function every - // time a new block is inserted. - renumberIndexes(); + renumberIndexes(newItr); std::sort(idx2MBBMap.begin(), idx2MBBMap.end(), Idx2MBBCompare()); }