Forgot to remove a register from the PHI-union after I'd determined that it
interfered with other registers. Seems like that might be a good thing to do. :-)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44902 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp
index 4762cf3..9519e7c 100644
--- a/lib/CodeGen/StrongPHIElimination.cpp
+++ b/lib/CodeGen/StrongPHIElimination.cpp
@@ -357,10 +357,11 @@
// Insert copies for child
for (int i = Inst->getNumOperands() - 1; i >= 2; i-=2) {
if (Inst->getOperand(i-1).getReg() == child->getReg()) {
- unsigned SrcReg = Inst->getOperand(i-1).getReg();
+ unsigned SrcReg = child->getReg();
MachineBasicBlock* From = Inst->getOperand(i).getMBB();
Waiting[From].push_back(std::make_pair(SrcReg, DestReg));
+ PHIUnion.erase(SrcReg);
}
}
@@ -369,10 +370,11 @@
// Insert copies for parent
for (int i = Inst->getNumOperands() - 1; i >= 2; i-=2) {
if (Inst->getOperand(i-1).getReg() == DFNode->getReg()) {
- unsigned SrcReg = Inst->getOperand(i-1).getReg();
+ unsigned SrcReg = DFNode->getReg();
MachineBasicBlock* From = Inst->getOperand(i).getMBB();
Waiting[From].push_back(std::make_pair(SrcReg, DestReg));
+ PHIUnion.erase(SrcReg);
}
}
}
@@ -380,10 +382,11 @@
// Insert copies for parent
for (int i = Inst->getNumOperands() - 1; i >= 2; i-=2) {
if (Inst->getOperand(i-1).getReg() == DFNode->getReg()) {
- unsigned SrcReg = Inst->getOperand(i-1).getReg();
+ unsigned SrcReg = DFNode->getReg();
MachineBasicBlock* From = Inst->getOperand(i).getMBB();
Waiting[From].push_back(std::make_pair(SrcReg, DestReg));
+ PHIUnion.erase(SrcReg);
}
}
}