Determine whether a spill kills the register it's spilling before insertion rather than trying to undo the kill marker afterwards.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@46953 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/RegAllocLocal.cpp b/lib/CodeGen/RegAllocLocal.cpp
index 12064a9..b14af27 100644
--- a/lib/CodeGen/RegAllocLocal.cpp
+++ b/lib/CodeGen/RegAllocLocal.cpp
@@ -303,17 +303,12 @@
const TargetRegisterClass *RC = MF->getRegInfo().getRegClass(VirtReg);
int FrameIndex = getStackSpaceFor(VirtReg, RC);
DOUT << " to stack slot #" << FrameIndex;
- TII->storeRegToStackSlot(MBB, I, PhysReg, true, FrameIndex, RC);
-
// If the instruction reads the register that's spilled, (e.g. this can
// happen if it is a move to a physical register), then the spill
// instruction is not a kill.
- if (I != MBB.end() && I->findRegisterUseOperandIdx(PhysReg) != -1) {
- MachineBasicBlock::iterator StoreMI = prior(I);
- int Idx = StoreMI->findRegisterUseOperandIdx(PhysReg, true);
- assert(Idx != -1 && "Unrecognized spill instruction!");
- StoreMI->getOperand(Idx).setIsKill(false);
- }
+ bool isKill = !(I != MBB.end() &&
+ I->findRegisterUseOperandIdx(PhysReg) != -1);
+ TII->storeRegToStackSlot(MBB, I, PhysReg, isKill, FrameIndex, RC);
++NumStores; // Update statistics
}