Remember to track spill slot uses in VirtRegMap when inserting loads and stores.

LocalRewriter::runOnMachineFunction uses this information to mark dead spill
slots.

This means that InlineSpiller now also works for functions that spill.

llvm-svn: 107302
This commit is contained in:
Jakob Stoklund Olesen 2010-06-30 18:19:08 +00:00
parent d92badfd9c
commit c39d3497c8
2 changed files with 4 additions and 0 deletions

View File

@ -95,6 +95,7 @@ void InlineSpiller::spill(LiveInterval *li,
tii_.loadRegFromStackSlot(*MI->getParent(), MII, NewVReg, SS, RC, &tri_);
--MII; // Point to load instruction.
SlotIndex LoadIdx = lis_.InsertMachineInstrInMaps(MII).getDefIndex();
vrm_.addSpillSlotUse(SS, MII);
DEBUG(dbgs() << "\treload: " << LoadIdx << '\t' << *MII);
VNInfo *LoadVNI = NewLI.getNextValue(LoadIdx, 0, true,
lis_.getVNInfoAllocator());
@ -124,6 +125,7 @@ void InlineSpiller::spill(LiveInterval *li,
&tri_);
--MII; // Point to store instruction.
SlotIndex StoreIdx = lis_.InsertMachineInstrInMaps(MII).getDefIndex();
vrm_.addSpillSlotUse(SS, MII);
DEBUG(dbgs() << "\tspilled: " << StoreIdx << '\t' << *MII);
VNInfo *StoreVNI = NewLI.getNextValue(Idx, 0, true,
lis_.getVNInfoAllocator());

View File

@ -137,6 +137,7 @@ protected:
MachineInstr *loadInstr(prior(miItr));
SlotIndex loadIndex =
lis->InsertMachineInstrInMaps(loadInstr).getDefIndex();
vrm->addSpilSlotUse(ss, loadInstr);
SlotIndex endIndex = loadIndex.getNextIndex();
VNInfo *loadVNI =
newLI->getNextValue(loadIndex, 0, true, lis->getVNInfoAllocator());
@ -150,6 +151,7 @@ protected:
MachineInstr *storeInstr(llvm::next(miItr));
SlotIndex storeIndex =
lis->InsertMachineInstrInMaps(storeInstr).getDefIndex();
vrm->addSpilSlotUse(ss, storeInstr);
SlotIndex beginIndex = storeIndex.getPrevIndex();
VNInfo *storeVNI =
newLI->getNextValue(beginIndex, 0, true, lis->getVNInfoAllocator());