1 files changed, 2 insertions, 1 deletions
diff --git a/lib/CodeGen/IfConversion.cpp b/lib/CodeGen/IfConversion.cpp
index 57862eb38c..95a5394f90 100644
--- a/lib/CodeGen/IfConversion.cpp
+++ b/lib/CodeGen/IfConversion.cpp
@@ -441,8 +441,9 @@ bool IfConverter::AnalyzeBlocks(MachineFunction &MF,
 /// isNextBlock - Returns true either if ToBB the next block after BB or
 /// that all the intervening blocks are empty.
 static bool isNextBlock(MachineBasicBlock *BB, MachineBasicBlock *ToBB) {
+  MachineFunction *MF = BB->getParent();
   MachineFunction::iterator I = BB;
-  while (++I != MachineFunction::iterator(ToBB))
+  while (++I != MF->end() && I != MachineFunction::iterator(ToBB))
     if (!I->empty())
       return false;
   return true;