wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some problems with the updating of SlotIndexes after adding a new MBB. In 

particular, holes were being left between two blocks after splitting an edge.

llvm-svn: 174868
This commit is contained in:
Cameron Zwarich 2013-02-11 09:24:42 +00:00
parent 829b478980
commit 02e742fbe6
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
llvm/include/llvm/CodeGen/SlotIndexes.h
View File

@ -603,25 +603,30 @@ namespace llvm {
MachineFunction::iterator nextMBB =
llvm::next(MachineFunction::iterator(mbb));
IndexListEntry *nextEntry = 0;
if (nextMBB == mbb->getParent()->end())
nextEntry = &indexList.back();
else
nextEntry = getMBBStartIdx(nextMBB).listEntry();
IndexListEntry *startEntry = createEntry(0, 0);
IndexListEntry *stopEntry = createEntry(0, 0);
indexList.insertAfter(nextEntry, startEntry);
indexList.insertAfter(startEntry, stopEntry);
IndexListEntry *startEntry = 0;
IndexListEntry *endEntry = 0;
if (nextMBB == mbb->getParent()->end()) {
startEntry = &indexList.back();
endEntry = createEntry(0, 0);
indexList.insertAfter(startEntry, endEntry);
} else {
startEntry = createEntry(0, 0);
endEntry = getMBBStartIdx(nextMBB).listEntry();
indexList.insert(endEntry, startEntry);
}
SlotIndex startIdx(startEntry, SlotIndex::Slot_Block);
SlotIndex endIdx(stopEntry, SlotIndex::Slot_Block);
SlotIndex endIdx(endEntry, SlotIndex::Slot_Block);
MachineFunction::iterator prevMBB(mbb);
assert(prevMBB != mbb->getParent()->end() &&
"Can't insert a new block at the beginning of a function.");
--prevMBB;
MBBRanges[prevMBB->getNumber()].second = startIdx;
assert(unsigned(mbb->getNumber()) == MBBRanges.size() &&
"Blocks must be added in order");
MBBRanges.push_back(std::make_pair(startIdx, endIdx));
idx2MBBMap.push_back(IdxMBBPair(startIdx, mbb));
// FIXME: Renumber locally instead of renumbering the whole function every