Merge pull request #18766 from gottesmm/pr-1fc1bcbaa94bb36d85e974fe09c97d87e9d60b04

[passmanager] Add the two last missing delete notifications.

Author: gottesmm

include/swift/SIL/TypeSubstCloner.h

@@ -361,7 +361,7 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
         // If the function was newly created with an empty body mark it as
         // undead.
         if (ParentFunction->empty()) {
-          M.eraseFunction(ParentFunction);
+          FuncBuilder.eraseFunction(ParentFunction);
           ParentFunction->setGenericEnvironment(OriginalEnvironment);
         }
       }

include/swift/SILOptimizer/Utils/SILOptFunctionBuilder.h

@@ -49,6 +49,12 @@ class SILOptFunctionBuilder {
     return f;
   }
 
+  void eraseFunction(SILFunction *f) {
+    auto &pm = getPassManager();
+    pm.notifyWillDeleteFunction(f);
+    pm.getModule()->eraseFunction(f);
+  }
+
 private:
   SILPassManager &getPassManager() const {
     return *transform.getPassManager();

lib/SILOptimizer/Mandatory/MandatoryInlining.cpp

@@ -676,10 +676,8 @@ class MandatoryInlining : public SILModuleTransform {
       if (F.getRepresentation() == SILFunctionTypeRepresentation::ObjCMethod)
         continue;
 
-      notifyWillDeleteFunction(&F);
-
       // Okay, just erase the function from the module.
-      M->eraseFunction(&F);
+      FuncBuilder.eraseFunction(&F);
     }
   }