diff --git a/llvm/lib/CodeGen/StrongPHIElimination.cpp b/llvm/lib/CodeGen/StrongPHIElimination.cpp
index 87bb8034883a92eb1e71963a4a4c63be109580af..91ec13df643c8101957721e56d8adfb76ef613ec 100644
--- a/llvm/lib/CodeGen/StrongPHIElimination.cpp
+++ b/llvm/lib/CodeGen/StrongPHIElimination.cpp
@@ -233,10 +233,9 @@ bool StrongPHIElimination::runOnMachineFunction(MachineFunction& MF) {
         addReg(SrcReg);
         unionRegs(DestReg, SrcReg);
 
-        for (MachineRegisterInfo::def_iterator DI = MRI->def_begin(SrcReg),
-             DE = MRI->def_end(); DI != DE; ++DI) {
-          PHISrcDefs[DI->getParent()].push_back(&*DI);
-        }
+        MachineInstr* DefMI = MRI->getVRegDef(SrcReg);
+        if (DefMI)
+          PHISrcDefs[DefMI->getParent()].push_back(DefMI);
       }
     }
   }