Make findLastUseBefore handle reg-unit liveness.

findLastUseBefore was previous considering virtreg liveness only, leading to
incorrect live intervals for reg units when instrs with physreg operands were
moved up.
 


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163685 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lang Hames 2012-09-12 06:56:16 +00:00
parent 7c02284774
commit 6d742cc61e

View File

@ -1196,14 +1196,35 @@ private:
// Return the last use of reg between NewIdx and OldIdx.
SlotIndex findLastUseBefore(unsigned Reg, SlotIndex OldIdx) {
SlotIndex LastUse = NewIdx;
for (MachineRegisterInfo::use_nodbg_iterator
UI = MRI.use_nodbg_begin(Reg),
UE = MRI.use_nodbg_end();
UI != UE; UI.skipInstruction()) {
const MachineInstr* MI = &*UI;
SlotIndex InstSlot = LIS.getSlotIndexes()->getInstructionIndex(MI);
if (InstSlot > LastUse && InstSlot < OldIdx)
LastUse = InstSlot;
if (TargetRegisterInfo::isVirtualRegister(Reg)) {
for (MachineRegisterInfo::use_nodbg_iterator
UI = MRI.use_nodbg_begin(Reg),
UE = MRI.use_nodbg_end();
UI != UE; UI.skipInstruction()) {
const MachineInstr* MI = &*UI;
SlotIndex InstSlot = LIS.getSlotIndexes()->getInstructionIndex(MI);
if (InstSlot > LastUse && InstSlot < OldIdx)
LastUse = InstSlot;
}
} else {
MachineInstr* MI = LIS.getSlotIndexes()->getInstructionFromIndex(NewIdx);
MachineBasicBlock::iterator MII(MI);
++MII;
MachineBasicBlock* MBB = MI->getParent();
for (; MII != MBB->end() && LIS.getInstructionIndex(MII) < OldIdx; ++MII){
for (MachineInstr::mop_iterator MOI = MII->operands_begin(),
MOE = MII->operands_end();
MOI != MOE; ++MOI) {
const MachineOperand& mop = *MOI;
if (!mop.isReg() || mop.getReg() == 0 ||
TargetRegisterInfo::isVirtualRegister(mop.getReg()))
continue;
if (TRI.hasRegUnit(mop.getReg(), Reg))
LastUse = LIS.getInstructionIndex(MII);
}
}
}
return LastUse;
}