Switch to top-down mode and fix a crasher this exposed caused by an error in the
live interval updating.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60652 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/PreAllocSplitting.cpp b/lib/CodeGen/PreAllocSplitting.cpp
index 1601445..fe1efe5 100644
--- a/lib/CodeGen/PreAllocSplitting.cpp
+++ b/lib/CodeGen/PreAllocSplitting.cpp
@@ -442,6 +442,9 @@
SE = MBB->succ_end(); SI != SE; ++SI)
WorkList.push_back(*SI);
+ SmallPtrSet<MachineBasicBlock*, 4> ProcessedBlocks;
+ ProcessedBlocks.insert(MBB);
+
while (!WorkList.empty()) {
MBB = WorkList.back();
WorkList.pop_back();
@@ -459,6 +462,13 @@
}
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();
@@ -1039,7 +1049,7 @@
// Make sure blocks are numbered in order.
MF.RenumberBlocks();
-#if 0
+#if 1
// FIXME: Go top down.
MachineBasicBlock *Entry = MF.begin();
SmallPtrSet<MachineBasicBlock*,16> Visited;