From ed2ffa25a18db3e9537bf919140f688bc415a055 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Wed, 12 Dec 2007 01:25:08 +0000 Subject: 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 --- lib/CodeGen/StrongPHIElimination.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/CodeGen/StrongPHIElimination.cpp') 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 @@ 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); } } } -- cgit v1.1