diff --git a/lib/Transforms/Scalar/LoopUnroll.cpp b/lib/Transforms/Scalar/LoopUnroll.cpp
index eff35e4f142..63696025cbb 100644
--- a/lib/Transforms/Scalar/LoopUnroll.cpp
+++ b/lib/Transforms/Scalar/LoopUnroll.cpp
@@ -304,6 +304,12 @@ bool LoopUnroll::runOnLoop(Loop *L, LPPassManager &LPM) {
       (*SI)->removeIncomingValue(LatchBlock, false);
       if (InVal)
         (*SI)->addIncoming(InVal, cast<BasicBlock>(LastValueMap[LatchBlock]));
+      if ((*SI)->getNumIncomingValues() == 0) {
+        // Remove this phi node.
+        // If anyone is using this PHI, make them use a dummy value instead...
+        (*SI)->replaceAllUsesWith(UndefValue::get((*SI)->getType()));
+        (*SI)->eraseFromParent();
+      }
     }
   }