aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/CodeGen/StrongPHIElimination.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp
index 4762cf37f6..9519e7c9d7 100644
--- a/lib/CodeGen/StrongPHIElimination.cpp
+++ b/lib/CodeGen/StrongPHIElimination.cpp
@@ -357,10 +357,11 @@ void StrongPHIElimination::processPHIUnion(MachineInstr* Inst,
// 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 @@ void StrongPHIElimination::processPHIUnion(MachineInstr* Inst,
// 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 @@ void StrongPHIElimination::processPHIUnion(MachineInstr* Inst,
// 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);
}
}
}