diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-02-08 23:26:48 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-02-08 23:26:48 +0000 |
| commit | 5a9683b31994f90924d402981cb98f24905f5759 (patch) | |
| tree | b1a8260408e8d8c51c8f242eb1a3ab52a610f0da | |
| parent | 843630781afec188174fe6b7f5b9c44e13a6449e (diff) | |
| download | bcm5719-llvm-5a9683b31994f90924d402981cb98f24905f5759.tar.gz bcm5719-llvm-5a9683b31994f90924d402981cb98f24905f5759.zip | |
Fix one more case of splitting after the last split point.
llvm-svn: 125137
| -rw-r--r-- | llvm/lib/CodeGen/RegAllocGreedy.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/llvm/lib/CodeGen/RegAllocGreedy.cpp b/llvm/lib/CodeGen/RegAllocGreedy.cpp index e767bbad7ed..cfef95e1e8a 100644 --- a/llvm/lib/CodeGen/RegAllocGreedy.cpp +++ b/llvm/lib/CodeGen/RegAllocGreedy.cpp @@ -746,8 +746,7 @@ void RAGreedy::splitAroundRegion(LiveInterval &VirtReg, unsigned PhysReg, continue; } - if (IP.second.getBoundaryIndex() < BI.LastUse && - IP.second.getBoundaryIndex() <= BI.LastSplitPoint) { + if (IP.second.getBoundaryIndex() < BI.LastUse) { // There are interference-free uses at the end of the block. // Find the first use that can get the live-out register. SmallVectorImpl<SlotIndex>::const_iterator UI = @@ -755,13 +754,16 @@ void RAGreedy::splitAroundRegion(LiveInterval &VirtReg, unsigned PhysReg, IP.second.getBoundaryIndex()); assert(UI != SA->UseSlots.end() && "Couldn't find last use"); SlotIndex Use = *UI; - DEBUG(dbgs() << ", free use at " << Use << ".\n"); assert(Use <= BI.LastUse && "Couldn't find last use"); - SlotIndex SegStart = SE.enterIntvBefore(Use); - assert(SegStart >= IP.second && "Couldn't avoid interference"); - assert(SegStart < BI.LastSplitPoint && "Impossible split point"); - SE.useIntv(SegStart, Stop); - continue; + // Only attempt a split befroe the last split point. + if (Use.getBaseIndex() <= BI.LastSplitPoint) { + DEBUG(dbgs() << ", free use at " << Use << ".\n"); + SlotIndex SegStart = SE.enterIntvBefore(Use); + assert(SegStart >= IP.second && "Couldn't avoid interference"); + assert(SegStart < BI.LastSplitPoint && "Impossible split point"); + SE.useIntv(SegStart, Stop); + continue; + } } // Interference is after the last use. |

