diff --git a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
index d828f042d9e..8406910e6b9 100644
--- a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
+++ b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
@@ -168,6 +168,8 @@ void PromoteMem2Reg::run() {
     //
     while (!I->use_empty()) {
       Instruction *U = cast<Instruction>(I->use_back());
+      if (!U->use_empty())  // If uses remain in dead code segment...
+        U->replaceAllUsesWith(Constant::getNullValue(U->getType()));
       U->getParent()->getInstList().erase(U);
     }