From 403dad66604a88d896bd43a39a289c164b7e581d Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Tue, 25 Mar 2008 22:25:27 +0000 Subject: [PATCH] StrongPHIElimination doesn't support swapping live intervals like the coalescer does. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48802 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/StrongPHIElimination.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp index ff5a9aa1b87..f45c95fdd35 100644 --- a/lib/CodeGen/StrongPHIElimination.cpp +++ b/lib/CodeGen/StrongPHIElimination.cpp @@ -866,15 +866,9 @@ void StrongPHIElimination::mergeLiveIntervals(unsigned primary, // If we get here, we know that we can coalesce the live ranges. Ask the // intervals to coalesce themselves now. - if ((RHS.ranges.size() > LHS.ranges.size() && - TargetRegisterInfo::isVirtualRegister(LHS.reg)) || - TargetRegisterInfo::isPhysicalRegister(RHS.reg)) { - RHS.join(LHS, &RHSValNoAssignments[0], &LHSValNoAssignments[0], NewVNInfo); - LI.removeInterval(primary); - } else { - LHS.join(RHS, &LHSValNoAssignments[0], &RHSValNoAssignments[0], NewVNInfo); - LI.removeInterval(secondary); - } + + LHS.join(RHS, &LHSValNoAssignments[0], &RHSValNoAssignments[0], NewVNInfo); + LI.removeInterval(secondary); } bool StrongPHIElimination::runOnMachineFunction(MachineFunction &Fn) { @@ -921,5 +915,8 @@ bool StrongPHIElimination::runOnMachineFunction(MachineFunction &Fn) { (*I)->eraseFromParent(); } + for (LiveIntervals::iterator I = LI.begin(), E = LI.end(); I != E; ++I) + I->second.dump(); + return false; }