6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-18 11:24:01 +00:00
Code Issues Projects Releases Wiki Activity

Handle unindexed instructions in SlotIndices.

Browse Source 
SlotIndexes::insertMachineInstrInMaps would crash when trying to insert an
instruction imediately after an unmapped debug value.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107504 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen
2010-07-02 19:54:45 +00:00
parent 3b9c7ebc44
commit ec8c3e8ccc
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -663,15 +663,20 @@ namespace llvm {
MachineBasicBlock::iterator miItr(mi); MachineBasicBlock::iterator miItr(mi);
bool needRenumber = false; bool needRenumber = false;
IndexListEntry *newEntry; IndexListEntry *newEntry;
// Get previous index, considering that not all instructions are indexed.
IndexListEntry *prevEntry; IndexListEntry *prevEntry;
if (miItr == mbb->begin()) { for (;;) {
// If mi is at the mbb beginning, get the prev index from the mbb. // If mi is at the mbb beginning, get the prev index from the mbb.
prevEntry = &mbbRangeItr->second.first.entry(); if (miItr == mbb->begin()) {
} else { prevEntry = &mbbRangeItr->second.first.entry();
// Otherwise get it from the previous instr. break;
MachineBasicBlock::iterator pItr(prior(miItr)); }
prevEntry = &getInstructionIndex(pItr).entry(); // Otherwise rewind until we find a mapped instruction.
Mi2IndexMap::const_iterator itr = mi2iMap.find(--miItr);
if (itr != mi2iMap.end()) {
prevEntry = &itr->second.entry();
break;
}
} }
// Get next entry from previous entry. // Get next entry from previous entry.