Index: llvm/lib/Transforms/IPO/FunctionSpecialization.cpp
===================================================================
--- llvm/lib/Transforms/IPO/FunctionSpecialization.cpp
+++ llvm/lib/Transforms/IPO/FunctionSpecialization.cpp
@@ -376,7 +376,7 @@
 
     // Remove the instruction from Block and Solver.
     if (auto *I = dyn_cast<Instruction>(V)) {
-      if (I->isSafeToRemove()) {
+      if (!I->isTerminator() && !I->isEHPad()) {
         ReplacedWithConstant.push_back(I);
         Solver.removeLatticeValueFor(I);
       }