1 files changed, 6 insertions, 9 deletions
diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp
index ff5a9aa..f45c95f 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;
 }