diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp
--- a/llvm/lib/Transforms/Scalar/LICM.cpp
+++ b/llvm/lib/Transforms/Scalar/LICM.cpp
@@ -1542,10 +1542,12 @@
   // predecessor fairly simple.
   if (!SafetyInfo->getBlockColors().empty() && BB->getFirstNonPHI()->isEHPad())
     return false;
-  for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI) {
-    BasicBlock *BBPred = *PI;
-    if (isa<IndirectBrInst>(BBPred->getTerminator()) ||
-        isa<CallBrInst>(BBPred->getTerminator()))
+  for (BasicBlock *BBPred : predecessors(BB)) {
+    const Instruction *T = BBPred->getTerminator();
+    if (auto *CBR = dyn_cast<CallBrInst>(T))
+      if (CBR->getDefaultDest() != BB)
+        return false;
+    if (isa<IndirectBrInst>(T))
       return false;
   }
   return true;
diff --git a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
--- a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
+++ b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp
@@ -533,11 +533,11 @@
   unsigned NumBroken = 0;
   for (BasicBlock &BB : F) {
     Instruction *TI = BB.getTerminator();
-    if (TI->getNumSuccessors() > 1 && !isa<IndirectBrInst>(TI) &&
-        !isa<CallBrInst>(TI))
-      for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i)
-        if (SplitCriticalEdge(TI, i, Options))
-          ++NumBroken;
+    if (isa<IndirectBrInst>(TI))
+      continue;
+    for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i)
+      if (SplitCriticalEdge(TI, i, Options))
+        ++NumBroken;
   }
   return NumBroken;
 }