diff --git a/lib/Module/CallSplitter.cpp b/lib/Module/CallSplitter.cpp
index 37e8e8a922b..63f859560f9 100644
--- a/lib/Module/CallSplitter.cpp
+++ b/lib/Module/CallSplitter.cpp
@@ -41,8 +41,8 @@ bool CallSplitter::runOnFunction(Function &F) {
         if (callInst != firstInst) {
           fbb = fbb->splitBasicBlock(callInst);
         }
-        if (afterCallInst->isTerminator() && !isa<InvokeInst>(afterCallInst) &&
-            !isa<ReturnInst>(afterCallInst)) {
+        if (isa<BranchInst>(afterCallInst) &&
+            cast<BranchInst>(afterCallInst)->isUnconditional()) {
           break;
         }
         fbb = fbb->splitBasicBlock(afterCallInst);