Switch to top-down mode and fix a crasher this exposed caused by an error in the

live interval updating.

llvm-svn: 60652
This commit is contained in:
Owen Anderson 2008-12-07 05:33:18 +00:00
parent f9e2394009
commit 12679470bf
1 changed files with 11 additions and 1 deletions

View File

@ -442,6 +442,9 @@ PreAllocSplitting::UpdateRegisterInterval(VNInfo *ValNo, unsigned SpillIndex,
SE = MBB->succ_end(); SI != SE; ++SI) SE = MBB->succ_end(); SI != SE; ++SI)
WorkList.push_back(*SI); WorkList.push_back(*SI);
SmallPtrSet<MachineBasicBlock*, 4> ProcessedBlocks;
ProcessedBlocks.insert(MBB);
while (!WorkList.empty()) { while (!WorkList.empty()) {
MBB = WorkList.back(); MBB = WorkList.back();
WorkList.pop_back(); WorkList.pop_back();
@ -459,6 +462,13 @@ PreAllocSplitting::UpdateRegisterInterval(VNInfo *ValNo, unsigned SpillIndex,
} }
Processed.insert(LR); Processed.insert(LR);
} }
ProcessedBlocks.insert(MBB);
if (LR)
for (MachineBasicBlock::succ_iterator SI = MBB->succ_begin(),
SE = MBB->succ_end(); SI != SE; ++SI)
if (!ProcessedBlocks.count(*SI))
WorkList.push_back(*SI);
} }
for (LiveInterval::iterator I = CurrLI->begin(), E = CurrLI->end(); for (LiveInterval::iterator I = CurrLI->begin(), E = CurrLI->end();
@ -1039,7 +1049,7 @@ bool PreAllocSplitting::runOnMachineFunction(MachineFunction &MF) {
// Make sure blocks are numbered in order. // Make sure blocks are numbered in order.
MF.RenumberBlocks(); MF.RenumberBlocks();
#if 0 #if 1
// FIXME: Go top down. // FIXME: Go top down.
MachineBasicBlock *Entry = MF.begin(); MachineBasicBlock *Entry = MF.begin();
SmallPtrSet<MachineBasicBlock*,16> Visited; SmallPtrSet<MachineBasicBlock*,16> Visited;