Merge pull request swiftlang#18725 from gottesmm/pr-1e9eaf3649841fc06185d9b353db89111ed4c380

[sil-pass-manager] Wire up pass manager to the new deserialization notification infrastructure.

Author: gottesmm

include/swift/SILOptimizer/PassManager/PassManager.h

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "swift/SIL/Notifications.h"
 #include "swift/SILOptimizer/Analysis/Analysis.h"
 #include "swift/SILOptimizer/PassManager/PassPipeline.h"
 #include "swift/SILOptimizer/PassManager/Passes.h"
@@ -101,6 +102,14 @@ class SILPassManager {
   /// The IRGen SIL passes. These have to be dynamically added by IRGen.
   llvm::DenseMap<unsigned, SILTransform *> IRGenPasses;
 
+  /// The notification handler for this specific SILPassManager.
+  ///
+  /// This is not owned by the pass manager, it is owned by the SILModule which
+  /// is guaranteed to outlive any pass manager associated with it. We keep this
+  /// bare pointer to ensure that we can deregister the notification after this
+  /// pass manager is destroyed.
+  DeserializationNotificationHandler *deserializationNotificationHandler;
+
 public:
   /// C'tor. It creates and registers all analysis passes, which are defined
   /// in Analysis.def.

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -230,11 +230,36 @@ class DebugPrintEnabler {
   }
 };
 
+//===----------------------------------------------------------------------===//
+//                 Serialization Notification Implementation
+//===----------------------------------------------------------------------===//
+
+namespace {
+
+class PassManagerDeserializationNotificationHandler final
+    : public DeserializationNotificationHandler {
+  NullablePtr<SILPassManager> pm;
+
+public:
+  PassManagerDeserializationNotificationHandler(SILPassManager *pm) : pm(pm) {}
+  ~PassManagerDeserializationNotificationHandler() override = default;
+
+  StringRef getName() const override {
+    return "PassManagerDeserializationNotificationHandler";
+  }
+
+  /// Observe that we deserialized a function declaration.
+  void didDeserialize(ModuleDecl *mod, SILFunction *fn) override {
+    pm.get()->notifyAnalysisOfFunction(fn);
+  }
+};
+
+} // end anonymous namespace
 
 SILPassManager::SILPassManager(SILModule *M, llvm::StringRef Stage,
-                               bool isMandatoryPipeline) :
-  Mod(M), StageName(Stage), isMandatoryPipeline(isMandatoryPipeline) {
-  
+                               bool isMandatoryPipeline)
+    : Mod(M), StageName(Stage), isMandatoryPipeline(isMandatoryPipeline),
+      deserializationNotificationHandler(nullptr) {
 #define ANALYSIS(NAME) \
   Analyses.push_back(create##NAME##Analysis(Mod));
 #include "swift/SILOptimizer/Analysis/Analysis.def"
@@ -243,6 +268,11 @@ SILPassManager::SILPassManager(SILModule *M, llvm::StringRef Stage,
     A->initialize(this);
     M->registerDeleteNotificationHandler(A);
   }
+
+  std::unique_ptr<DeserializationNotificationHandler> handler(
+      new PassManagerDeserializationNotificationHandler(this));
+  deserializationNotificationHandler = handler.get();
+  M->registerDeserializationNotificationHandler(std::move(handler));
 }
 
 SILPassManager::SILPassManager(SILModule *M, irgen::IRGenModule *IRMod,
@@ -539,6 +569,10 @@ SILPassManager::~SILPassManager() {
   assert(IRGenPasses.empty() && "Must add IRGen SIL passes that were "
                                 "registered to the list of transformations");
 
+  // Remove our deserialization notification handler.
+  Mod->removeDeserializationNotificationHandler(
+      deserializationNotificationHandler);
+
   // Free all transformations.
   for (auto *T : Transformations)
     delete T;