diff --git a/llvm/include/llvm/Transforms/IPO/FunctionSpecialization.h b/llvm/include/llvm/Transforms/IPO/FunctionSpecialization.h
index 5a682e8c7b5eb..33ff917aa1540 100644
--- a/llvm/include/llvm/Transforms/IPO/FunctionSpecialization.h
+++ b/llvm/include/llvm/Transforms/IPO/FunctionSpecialization.h
@@ -261,10 +261,12 @@ class FunctionSpecializer {
       : Solver(Solver), M(M), FAM(FAM), GetBFI(GetBFI), GetTLI(GetTLI),
         GetTTI(GetTTI), GetAC(GetAC) {}
 
-  LLVM_ABI ~FunctionSpecializer();
-
   LLVM_ABI bool run();
 
+  // Clean dead functions and ssa copies introduced in specializations.
+  // Return true if removing any dead function.
+  bool cleanUp();
+
   InstCostVisitor getInstCostVisitorFor(Function *F) {
     auto &TTI = GetTTI(*F);
     return InstCostVisitor(GetBFI, F, M.getDataLayout(), TTI, Solver);
diff --git a/llvm/lib/Transforms/IPO/FunctionSpecialization.cpp b/llvm/lib/Transforms/IPO/FunctionSpecialization.cpp
index a459a9eddbcfc..01515c2b035b8 100644
--- a/llvm/lib/Transforms/IPO/FunctionSpecialization.cpp
+++ b/llvm/lib/Transforms/IPO/FunctionSpecialization.cpp
@@ -639,14 +639,15 @@ template <> struct llvm::DenseMapInfo<SpecSig> {
   }
 };
 
-FunctionSpecializer::~FunctionSpecializer() {
-  LLVM_DEBUG(
-    if (NumSpecsCreated > 0)
-      dbgs() << "FnSpecialization: Created " << NumSpecsCreated
+bool FunctionSpecializer::cleanUp() {
+  bool MadeChanges = !DeadFunctions.empty();
+  LLVM_DEBUG(if (NumSpecsCreated > 0) dbgs()
+             << "FnSpecialization: Created " << NumSpecsCreated
              << " specializations in module " << M.getName() << "\n");
   // Eliminate dead code.
   removeDeadFunctions();
   cleanUpSSA();
+  return MadeChanges;
 }
 
 /// Get the unsigned Value of given Cost object. Assumes the Cost is always
diff --git a/llvm/lib/Transforms/IPO/SCCP.cpp b/llvm/lib/Transforms/IPO/SCCP.cpp
index e98a70f228ada..25b001eb4aa3f 100644
--- a/llvm/lib/Transforms/IPO/SCCP.cpp
+++ b/llvm/lib/Transforms/IPO/SCCP.cpp
@@ -354,6 +354,9 @@ static bool runIPSCCP(
     ++NumGlobalConst;
   }
 
+  if (IsFuncSpecEnabled)
+    MadeChanges |= Specializer.cleanUp();
+
   return MadeChanges;
 }