Simplify moveEnteringDownFrom rules.

[oota-llvm.git] / lib / CodeGen / LiveIntervalAnalysis.cpp

diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp
index 6c5dd0e611907072bebef7a563ea90033019ef23..66c65b4a31621ae8bc91f74b80f5011d61badfe5 100644 (file)
--- a/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -1205,17 +1205,9 @@ private:
   void moveEnteringDownFrom(SlotIndex OldIdx, IntRangePair& P) {
     LiveInterval* LI = P.first;
     LiveRange* LR = P.second;
-    bool LiveThrough = LR->end > OldIdx.getRegSlot();
-    if (LiveThrough) {
-      MachineBasicBlock* MBB = LIS.getInstructionFromIndex(NewIdx)->getParent();
-      bool LiveOut = LR->end >= LIS.getSlotIndexes()->getMBBEndIdx(MBB);
-      if (!LiveOut) {
-        moveKillFlags(LI->reg, LR->end, NewIdx);
-        LR->end = NewIdx.getRegSlot(LR->end.isEarlyClobber());
-      }
-    } else {
-      // Not live through. Easy - just update the range endpoint.
-      LR->end = NewIdx.getRegSlot(LR->end.isEarlyClobber());
+    if (NewIdx > LR->end) {
+      moveKillFlags(LI->reg, LR->end, NewIdx);
+      LR->end = NewIdx.getRegSlot();
     }
   }