@@ -407,7 +407,7 @@ class StackColoring {
407407
408408 // / Maps slots to their use interval. Outside of this interval, slots
409409 // / 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;
411411
412412 // / Maps slots to the points where they can become in-use.
413413 SmallVector<SmallVector<SlotIndex, 4 >, 16 > LiveStarts;
@@ -1035,7 +1035,7 @@ void StackColoring::remapInstructions(DenseMap<int, int> &SlotRemap) {
10351035 // validating the instructions.
10361036 if (!I.isDebugInstr () && TouchesMemory && ProtectFromEscapedAllocas) {
10371037 SlotIndex Index = Indexes->getInstructionIndex (I);
1038- const LiveInterval *Interval = &*Intervals[FromSlot];
1038+ const LiveRange *Interval = &*Intervals[FromSlot];
10391039 assert (Interval->find (Index) != Interval->end () &&
10401040 " Found instruction usage outside of live range." );
10411041 }
@@ -1155,7 +1155,7 @@ void StackColoring::removeInvalidSlotRanges() {
11551155
11561156 // Check that the used slot is inside the calculated lifetime range.
11571157 // If it is not, warn about it and invalidate the range.
1158- LiveInterval *Interval = &*Intervals[Slot];
1158+ LiveRange *Interval = &*Intervals[Slot];
11591159 SlotIndex Index = Indexes->getInstructionIndex (I);
11601160 if (Interval->find (Index) == Interval->end ()) {
11611161 Interval->clear ();
@@ -1247,7 +1247,7 @@ bool StackColoring::run(MachineFunction &Func) {
12471247 }
12481248
12491249 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 ( ));
12511251 LI->getNextValue (Indexes->getZeroIndex (), VNInfoAllocator);
12521252 Intervals.push_back (std::move (LI));
12531253 SortedSlots.push_back (i);
@@ -1317,8 +1317,8 @@ bool StackColoring::run(MachineFunction &Func) {
13171317 if (MFI->getStackID (FirstSlot) != MFI->getStackID (SecondSlot))
13181318 continue ;
13191319
1320- LiveInterval *First = &*Intervals[FirstSlot];
1321- LiveInterval *Second = &*Intervals[SecondSlot];
1320+ LiveRange *First = &*Intervals[FirstSlot];
1321+ LiveRange *Second = &*Intervals[SecondSlot];
13221322 auto &FirstS = LiveStarts[FirstSlot];
13231323 auto &SecondS = LiveStarts[SecondSlot];
13241324 assert (!First->empty () && !Second->empty () && " Found an empty range" );
0 commit comments