diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp
index b04a8792909..fb625fd0866 100644
--- a/lib/CodeGen/StrongPHIElimination.cpp
+++ b/lib/CodeGen/StrongPHIElimination.cpp
@@ -884,38 +884,41 @@ bool StrongPHIElimination::runOnMachineFunction(MachineFunction &Fn) {
        I != E; ) {
     MachineInstr* PInstr = *(I++);
     
-    // Trim live intervals of input registers.  They are no longer live into
-    // this block.
-    for (unsigned i = 1; i < PInstr->getNumOperands(); i += 2) {
-      unsigned reg = PInstr->getOperand(i).getReg();
-      MachineBasicBlock* MBB = PInstr->getOperand(i+1).getMBB();
-      LiveInterval& InputI = LI.getInterval(reg);
-      if (MBB != PInstr->getParent() &&
-          InputI.liveAt(LI.getMBBStartIdx(PInstr->getParent())))
-        InputI.removeRange(LI.getMBBStartIdx(PInstr->getParent()),
-                           LI.getInstructionIndex(PInstr),
-                           true);
-    }
-    
-    // If this is a dead PHI node, then remove it from LiveIntervals.
-    unsigned DestReg = PInstr->getOperand(0).getReg();
-    LiveInterval& PI = LI.getInterval(DestReg);
-    if (PInstr->registerDefIsDead(DestReg)) {
-      if (PI.containsOneValue()) {
-        LI.removeInterval(DestReg);
-      } else {
-        unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr));
-        PI.removeRange(*PI.getLiveRangeContaining(idx), true);
+    // Don't do live interval updating for dead PHIs.
+    if (!PInstr->registerDefIsDead(PInstr->getOperand(0).getReg())) {
+      // Trim live intervals of input registers.  They are no longer live into
+      // this block.
+      for (unsigned i = 1; i < PInstr->getNumOperands(); i += 2) {
+        unsigned reg = PInstr->getOperand(i).getReg();
+        MachineBasicBlock* MBB = PInstr->getOperand(i+1).getMBB();
+        LiveInterval& InputI = LI.getInterval(reg);
+        if (MBB != PInstr->getParent() &&
+            InputI.liveAt(LI.getMBBStartIdx(PInstr->getParent())))
+          InputI.removeRange(LI.getMBBStartIdx(PInstr->getParent()),
+                             LI.getInstructionIndex(PInstr),
+                             true);
+      }
+      
+      // If this is a dead PHI node, then remove it from LiveIntervals.
+      unsigned DestReg = PInstr->getOperand(0).getReg();
+      LiveInterval& PI = LI.getInterval(DestReg);
+      if (PInstr->registerDefIsDead(DestReg)) {
+        if (PI.containsOneValue()) {
+          LI.removeInterval(DestReg);
+        } else {
+          unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr));
+          PI.removeRange(*PI.getLiveRangeContaining(idx), true);
+        }
+      } else {
+        // If the PHI is not dead, then the valno defined by the PHI
+        // now has an unknown def.
+        unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr));
+        const LiveRange* PLR = PI.getLiveRangeContaining(idx);
+        PLR->valno->def = ~0U;
+        LiveRange R (LI.getMBBStartIdx(PInstr->getParent()),
+                    PLR->start, PLR->valno);
+        PI.addRange(R);
       }
-    } else {
-      // If the PHI is not dead, then the valno defined by the PHI
-      // now has an unknown def.
-      unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr));
-      const LiveRange* PLR = PI.getLiveRangeContaining(idx);
-      PLR->valno->def = ~0U;
-      LiveRange R (LI.getMBBStartIdx(PInstr->getParent()),
-                   PLR->start, PLR->valno);
-      PI.addRange(R);
     }
     
     LI.RemoveMachineInstrFromMaps(PInstr);