Merge pull request #17997 from gottesmm/pr-9b72b754f0ee03ae098595b6de404a51f364c1d1

Author: swift-ci

include/swift/SILOptimizer/PassManager/PassManager.h

@@ -48,7 +48,7 @@ class SILPassManager {
   llvm::SmallVector<SILTransform *, 16> Transformations;
 
   /// A list of registered analysis.
-  llvm::SmallVector<SILAnalysis *, 16> Analysis;
+  llvm::SmallVector<SILAnalysis *, 16> Analyses;
 
   /// An entry in the FunctionWorkList.
   struct WorklistEntry {
@@ -122,7 +122,7 @@ class SILPassManager {
   /// analysis. If the analysis is not found, the program terminates.
   template<typename T>
   T *getAnalysis() {
-    for (SILAnalysis *A : Analysis)
+    for (SILAnalysis *A : Analyses)
       if (auto *R = llvm::dyn_cast<T>(A))
         return R;
 
@@ -145,7 +145,7 @@ class SILPassManager {
   /// \brief Iterate over all analysis and invalidate them.
   void invalidateAllAnalysis() {
     // Invalidate the analysis (unless they are locked)
-    for (auto AP : Analysis)
+    for (auto AP : Analyses)
       if (!AP->isLocked())
         AP->invalidate();
 
@@ -170,7 +170,7 @@ class SILPassManager {
   /// 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) {
+    for (auto AP : Analyses) {
       AP->notifyAddedOrModifiedFunction(F);
     }
   }
@@ -179,7 +179,7 @@ class SILPassManager {
   void invalidateAnalysis(SILFunction *F,
                           SILAnalysis::InvalidationKind K) {
     // Invalidate the analysis (unless they are locked)
-    for (auto AP : Analysis)
+    for (auto AP : Analyses)
       if (!AP->isLocked())
         AP->invalidate(F, K);
 
@@ -192,7 +192,7 @@ class SILPassManager {
   /// or vtables.
   void invalidateFunctionTables() {
     // Invalidate the analysis (unless they are locked)
-    for (auto AP : Analysis)
+    for (auto AP : Analyses)
       if (!AP->isLocked())
         AP->invalidateFunctionTables();
 
@@ -205,7 +205,7 @@ class SILPassManager {
   /// \brief Iterate over all analysis and notify them of a deleted function.
   void notifyDeleteFunction(SILFunction *F) {
     // Invalidate the analysis (unless they are locked)
-    for (auto AP : Analysis)
+    for (auto AP : Analyses)
       if (!AP->isLocked())
         AP->notifyWillDeleteFunction(F);
 
@@ -233,7 +233,7 @@ class SILPassManager {
 
   /// Verify all analyses.
   void verifyAnalyses() const {
-    for (auto *A : Analysis) {
+    for (auto *A : Analyses) {
       A->verify();
     }
   }
@@ -245,7 +245,7 @@ class SILPassManager {
   /// this. If no override is provided the SILAnalysis should just call the
   /// normal verify method.
   void verifyAnalyses(SILFunction *F) const {
-    for (auto *A : Analysis) {
+    for (auto *A : Analyses) {
       A->verify(F);
     }
   }

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -236,10 +236,10 @@ SILPassManager::SILPassManager(SILModule *M, llvm::StringRef Stage,
   Mod(M), StageName(Stage), isMandatoryPipeline(isMandatoryPipeline) {
 
 #define ANALYSIS(NAME) \
-  Analysis.push_back(create##NAME##Analysis(Mod));
+  Analyses.push_back(create##NAME##Analysis(Mod));
 #include "swift/SILOptimizer/Analysis/Analysis.def"
 
-  for (SILAnalysis *A : Analysis) {
+  for (SILAnalysis *A : Analyses) {
     A->initialize(this);
     M->registerDeleteNotificationHandler(A);
   }
@@ -258,7 +258,7 @@ bool SILPassManager::continueTransforming() {
 }
 
 bool SILPassManager::analysesUnlocked() {
-  for (auto *A : Analysis)
+  for (auto *A : Analyses)
     if (A->isLocked())
       return false;
 
@@ -544,7 +544,7 @@ SILPassManager::~SILPassManager() {
     delete T;
 
   // delete the analysis.
-  for (auto *A : Analysis) {
+  for (auto *A : Analyses) {
     Mod->removeDeleteNotificationHandler(A);
     assert(!A->isLocked() &&
            "Deleting a locked analysis. Did we forget to unlock ?");