@@ -407,7 +407,7 @@ class StackColoring {
407
407
408
408
// / Maps slots to their use interval. Outside of this interval, slots
409
409
// / values are either dead or `undef` and they will not be written to.
410
- SmallVector<std::unique_ptr<LiveInterval >, 16 > Intervals;
410
+ SmallVector<std::unique_ptr<LiveRange >, 16 > Intervals;
411
411
412
412
// / Maps slots to the points where they can become in-use.
413
413
SmallVector<SmallVector<SlotIndex, 4 >, 16 > LiveStarts;
@@ -1035,7 +1035,7 @@ void StackColoring::remapInstructions(DenseMap<int, int> &SlotRemap) {
1035
1035
// validating the instructions.
1036
1036
if (!I.isDebugInstr () && TouchesMemory && ProtectFromEscapedAllocas) {
1037
1037
SlotIndex Index = Indexes->getInstructionIndex (I);
1038
- const LiveInterval *Interval = &*Intervals[FromSlot];
1038
+ const LiveRange *Interval = &*Intervals[FromSlot];
1039
1039
assert (Interval->find (Index) != Interval->end () &&
1040
1040
" Found instruction usage outside of live range." );
1041
1041
}
@@ -1155,7 +1155,7 @@ void StackColoring::removeInvalidSlotRanges() {
1155
1155
1156
1156
// Check that the used slot is inside the calculated lifetime range.
1157
1157
// If it is not, warn about it and invalidate the range.
1158
- LiveInterval *Interval = &*Intervals[Slot];
1158
+ LiveRange *Interval = &*Intervals[Slot];
1159
1159
SlotIndex Index = Indexes->getInstructionIndex (I);
1160
1160
if (Interval->find (Index) == Interval->end ()) {
1161
1161
Interval->clear ();
@@ -1247,7 +1247,7 @@ bool StackColoring::run(MachineFunction &Func) {
1247
1247
}
1248
1248
1249
1249
for (unsigned i=0 ; i < NumSlots; ++i) {
1250
- std::unique_ptr<LiveInterval > LI (new LiveInterval (i, 0 ));
1250
+ std::unique_ptr<LiveRange > LI (new LiveRange ( ));
1251
1251
LI->getNextValue (Indexes->getZeroIndex (), VNInfoAllocator);
1252
1252
Intervals.push_back (std::move (LI));
1253
1253
SortedSlots.push_back (i);
@@ -1317,8 +1317,8 @@ bool StackColoring::run(MachineFunction &Func) {
1317
1317
if (MFI->getStackID (FirstSlot) != MFI->getStackID (SecondSlot))
1318
1318
continue ;
1319
1319
1320
- LiveInterval *First = &*Intervals[FirstSlot];
1321
- LiveInterval *Second = &*Intervals[SecondSlot];
1320
+ LiveRange *First = &*Intervals[FirstSlot];
1321
+ LiveRange *Second = &*Intervals[SecondSlot];
1322
1322
auto &FirstS = LiveStarts[FirstSlot];
1323
1323
auto &SecondS = LiveStarts[SecondSlot];
1324
1324
assert (!First->empty () && !Second->empty () && " Found an empty range" );
0 commit comments