1 files changed, 5 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/Analysis.cpp b/llvm/lib/CodeGen/Analysis.cpp
index d690734..9fb29b8 100644
--- a/llvm/lib/CodeGen/Analysis.cpp
+++ b/llvm/lib/CodeGen/Analysis.cpp
@@ -694,6 +694,11 @@ llvm::getFuncletMembership(const MachineFunction &MF) {
     }
 
     MachineBasicBlock::const_iterator MBBI = MBB.getFirstTerminator();
+
+    // FIXME: Should this be an assertion?  It fires all over in X86.
+    if (MBBI == MBB.end())
+      continue;
+
     // CatchPads are not funclets for SEH so do not consider CatchRet to
     // transfer control to another funclet.
     if (MBBI->getOpcode() != TII->getCatchReturnOpcode())