Merge pull request #17986 from gottesmm/pr-116cd0fb9a19e15c0f241d9597bdadc38c2e24c2

Author: swift-ci

include/swift/SILOptimizer/Analysis/AccessSummaryAnalysis.h

@@ -199,7 +199,7 @@ class AccessSummaryAnalysis : public BottomUpIPAnalysis {
   virtual void invalidate() override;
   virtual void invalidate(SILFunction *F, InvalidationKind K) override;
   virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
-  virtual void notifyDeleteFunction(SILFunction *F) override {
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {
     invalidate(F, InvalidationKind::Nothing);
   }
   virtual void invalidateFunctionTables() override {}

include/swift/SILOptimizer/Analysis/AliasAnalysis.h

@@ -285,7 +285,7 @@ class AliasAnalysis : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override { }
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {}
 
   virtual void invalidateFunctionTables() override { }
 };

include/swift/SILOptimizer/Analysis/Analysis.h

@@ -119,9 +119,9 @@ class SILAnalysis : public DeleteNotificationHandler {
   /// Notify the analysis about a newly added or modified function.
   virtual void notifyAddedOrModifiedFunction(SILFunction *f) = 0;
 
-  /// Notify the analysis about a function which will be deleted from the
+  /// Notify the analysis about a function that will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *f) = 0;
+  virtual void notifyWillDeleteFunction(SILFunction *f) = 0;
 
   /// Notify the analysis about changed witness or vtables.
   virtual void invalidateFunctionTables() = 0;
@@ -248,7 +248,7 @@ class FunctionAnalysisBase : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *f) override {
+  virtual void notifyWillDeleteFunction(SILFunction *f) override {
     invalidateFunction(f);
   }
 

include/swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h

@@ -151,10 +151,10 @@ class BasicCalleeAnalysis : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override {
-    // No invalidation needed because the analysis does not cache anything
-    // per call-site in functions.
-  };
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {
+    // No invalidation needed because the analysis does not cache anything per
+    // call-site in functions.
+  }
 
   /// Notify the analysis about changed witness or vtables.
   virtual void invalidateFunctionTables() override {

include/swift/SILOptimizer/Analysis/CallerAnalysis.h

@@ -111,7 +111,7 @@ class CallerAnalysis : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override {
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {
     invalidateExistingCalleeRelation(F);
     RecomputeFunctionList.remove(F);
   }

include/swift/SILOptimizer/Analysis/ClassHierarchyAnalysis.h

@@ -58,7 +58,7 @@ class ClassHierarchyAnalysis : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override { }
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {}
 
   /// Notify the analysis about changed witness or vtables.
   virtual void invalidateFunctionTables() override { }

include/swift/SILOptimizer/Analysis/ClosureScope.h

@@ -151,7 +151,7 @@ class ClosureScopeAnalysis : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override;
+  virtual void notifyWillDeleteFunction(SILFunction *F) override;
 
   /// Notify the analysis about changed witness or vtables.
   virtual void invalidateFunctionTables() override {

include/swift/SILOptimizer/Analysis/DestructorAnalysis.h

@@ -50,7 +50,7 @@ class DestructorAnalysis : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override { }
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {}
 
   /// Notify the analysis about changed witness or vtables.
   virtual void invalidateFunctionTables() override { }

include/swift/SILOptimizer/Analysis/EscapeAnalysis.h

@@ -806,7 +806,7 @@ class EscapeAnalysis : public BottomUpIPAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override {
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {
     invalidate(F, InvalidationKind::Nothing);
   }
 

include/swift/SILOptimizer/Analysis/ProtocolConformanceAnalysis.h

@@ -58,7 +58,7 @@ class ProtocolConformanceAnalysis : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override {}
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {}
 
   /// Notify the analysis about changed witness or vtables.
   virtual void invalidateFunctionTables() override {}

include/swift/SILOptimizer/Analysis/SideEffectAnalysis.h

@@ -127,7 +127,7 @@ class GenericFunctionEffectAnalysis : public BottomUpIPAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override {
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {
     invalidate(F, InvalidationKind::Nothing);
   }
 

include/swift/SILOptimizer/Analysis/TypeExpansionAnalysis.h

@@ -48,7 +48,7 @@ class TypeExpansionAnalysis : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override { }
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {}
 
   /// Notify the analysis about changed witness or vtables.
   virtual void invalidateFunctionTables() override { }

include/swift/SILOptimizer/PassManager/PassManager.h

@@ -207,8 +207,8 @@ class SILPassManager {
     // Invalidate the analysis (unless they are locked)
     for (auto AP : Analysis)
       if (!AP->isLocked())
-        AP->notifyDeleteFunction(F);
-    
+        AP->notifyWillDeleteFunction(F);
+
     CurrentPassHasInvalidated = true;
     // Any change let all passes run again.
     CompletedPassesMap[F].reset();

lib/SILOptimizer/Analysis/ClosureScope.cpp

@@ -150,7 +150,7 @@ void ClosureScopeAnalysis::invalidate() {
   if (scopeData) scopeData->reset();
 }
 
-void ClosureScopeAnalysis::notifyDeleteFunction(SILFunction *F) {
+void ClosureScopeAnalysis::notifyWillDeleteFunction(SILFunction *F) {
   if (scopeData) scopeData->erase(F);
 }
 

lib/SILOptimizer/Utils/OptimizerStatsUtils.cpp

@@ -498,7 +498,7 @@ class OptimizerStatsAnalysis : public SILAnalysis {
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.
-  virtual void notifyDeleteFunction(SILFunction *F) override {
+  virtual void notifyWillDeleteFunction(SILFunction *F) override {
     DeletedFuncs.push_back(F);
   };