- Change the horrible N^2 isRegReDefinedByTwoAddr. Now callers must supply the operand index of def machineoperand and at most one full scan of non-implicit operands is needed.
- Change local register allocator to use the new isRegReDefinedByTwoAddr instead of reinventing the wheel.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53394 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/RegAllocLocal.cpp b/lib/CodeGen/RegAllocLocal.cpp
index c1dacb6..d3e38d0 100644
--- a/lib/CodeGen/RegAllocLocal.cpp
+++ b/lib/CodeGen/RegAllocLocal.cpp
@@ -604,25 +604,15 @@
if (last != LastUseDef.end()) {
// Check if this is a two address instruction. If so, then
// the def does not kill the use.
- if (last->second.first == I) {
- bool isTwoAddr = false;
- for (unsigned j = i+1, je = I->getDesc().getNumOperands();
- j < je; ++j) {
- const MachineOperand &MO2 = I->getOperand(j);
- if (MO2.isRegister() && MO2.isUse() &&
- MO2.getReg() == MO.getReg() &&
- I->getDesc().getOperandConstraint(j, TOI::TIED_TO) == (int)i)
- isTwoAddr = true;
- }
-
- if (isTwoAddr) continue;
- }
+ if (last->second.first == I &&
+ I->isRegReDefinedByTwoAddr(MO.getReg(), i))
+ continue;
MachineOperand& lastUD =
last->second.first->getOperand(last->second.second);
if (lastUD.isDef())
lastUD.setIsDead(true);
- else if (lastUD.isUse())
+ else
lastUD.setIsKill(true);
}
@@ -677,7 +667,7 @@
if (isPhysReg || !usedOutsideBlock) {
if (MO.isUse())
MO.setIsKill(true);
- else if (MI->getOperand(idx).isDef())
+ else
MO.setIsDead(true);
}
}