Merge pull request #17981 from gottesmm/pr-bb6b110e15966e87bcdba7920a631ccc9000b500

Author: swift-ci

include/swift/SILOptimizer/Analysis/AccessSummaryAnalysis.h

@@ -198,7 +198,7 @@ class AccessSummaryAnalysis : public BottomUpIPAnalysis {
   virtual void initialize(SILPassManager *PM) override {}
   virtual void invalidate() override;
   virtual void invalidate(SILFunction *F, InvalidationKind K) override;
-  virtual void notifyAddFunction(SILFunction *F) override {}
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
   virtual void notifyDeleteFunction(SILFunction *F) override {
     invalidate(F, InvalidationKind::Nothing);
   }

include/swift/SILOptimizer/Analysis/AliasAnalysis.h

@@ -281,7 +281,7 @@ class AliasAnalysis : public SILAnalysis {
   }
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override { }
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.

include/swift/SILOptimizer/Analysis/Analysis.h

@@ -116,8 +116,8 @@ class SILAnalysis : public DeleteNotificationHandler {
   /// Invalidate all of the information for a specific function.
   virtual void invalidate(SILFunction *f, InvalidationKind k) = 0;
 
-  /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *f) = 0;
+  /// 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
   /// module.
@@ -244,7 +244,7 @@ class FunctionAnalysisBase : public SILAnalysis {
   }
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *f) override {}
+  virtual void notifyAddedOrModifiedFunction(SILFunction *f) override {}
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.

include/swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h

@@ -144,7 +144,7 @@ class BasicCalleeAnalysis : public SILAnalysis {
   }
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override {
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {
     // Nothing to be done because the analysis does not cache anything
     // per call-site in functions.
   }

include/swift/SILOptimizer/Analysis/CallerAnalysis.h

@@ -104,8 +104,8 @@ class CallerAnalysis : public SILAnalysis {
     RecomputeFunctionList.insert(F);
   }
 
-  /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override {
+  /// Notify the analysis about a newly created or modified function.
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {
     RecomputeFunctionList.insert(F);
   }
 

include/swift/SILOptimizer/Analysis/ClassHierarchyAnalysis.h

@@ -54,7 +54,7 @@ class ClassHierarchyAnalysis : public SILAnalysis {
   virtual void invalidate(SILFunction *F, InvalidationKind K) override { }
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override { }
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.

include/swift/SILOptimizer/Analysis/ClosureScope.h

@@ -144,7 +144,7 @@ class ClosureScopeAnalysis : public SILAnalysis {
   }
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override {
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {
     // Nothing to be done because the analysis does not cache anything
     // per call-site in functions.
   }

include/swift/SILOptimizer/Analysis/DestructorAnalysis.h

@@ -46,7 +46,7 @@ class DestructorAnalysis : public SILAnalysis {
   }
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override { }
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.

include/swift/SILOptimizer/Analysis/EscapeAnalysis.h

@@ -802,7 +802,7 @@ class EscapeAnalysis : public BottomUpIPAnalysis {
   virtual void invalidate(SILFunction *F, InvalidationKind K) override;
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override { }
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.

include/swift/SILOptimizer/Analysis/ProtocolConformanceAnalysis.h

@@ -54,7 +54,7 @@ class ProtocolConformanceAnalysis : public SILAnalysis {
   virtual void invalidate(SILFunction *F, InvalidationKind K) override {}
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override {}
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.

include/swift/SILOptimizer/Analysis/SideEffectAnalysis.h

@@ -123,7 +123,7 @@ class GenericFunctionEffectAnalysis : public BottomUpIPAnalysis {
   virtual void invalidate(SILFunction *F, InvalidationKind K) override;
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override {}
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.

include/swift/SILOptimizer/Analysis/TypeExpansionAnalysis.h

@@ -44,7 +44,7 @@ class TypeExpansionAnalysis : public SILAnalysis {
   virtual void invalidate(SILFunction *F, InvalidationKind K)  override { }
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override { }
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {}
 
   /// Notify the analysis about a function which will be deleted from the
   /// module.

include/swift/SILOptimizer/PassManager/PassManager.h

@@ -163,14 +163,16 @@ class SILPassManager {
   /// is derived. This is used to avoid an infinite amount of functions pushed
   /// on the worklist (e.g. caused by a bug in a specializing optimization).
   void addFunctionToWorklist(SILFunction *F, SILFunction *DerivedFrom);
-  
+
   /// \brief Iterate over all analysis and notify them of the function.
+  ///
   /// This function does not necessarily have to be newly created function. It
   /// is the job of the analysis to make sure no extra work is done if the
   /// particular analysis has been done on the function.
   void notifyAnalysisOfFunction(SILFunction *F) {
-    for (auto AP : Analysis)
-      AP->notifyAddFunction(F);
+    for (auto AP : Analysis) {
+      AP->notifyAddedOrModifiedFunction(F);
+    }
   }
 
   /// \brief Broadcast the invalidation of the function to all analysis.

lib/SILOptimizer/Utils/OptimizerStatsUtils.cpp

@@ -492,7 +492,7 @@ class OptimizerStatsAnalysis : public SILAnalysis {
   }
 
   /// Notify the analysis about a newly created function.
-  virtual void notifyAddFunction(SILFunction *F) override {
+  virtual void notifyAddedOrModifiedFunction(SILFunction *F) override {
     AddedFuncs.push_back(F);
   }