Merge pull request #18765 from gottesmm/pr-c28068372a21dccd2c3076e1f666f346e90865e4

Author: swift-ci

include/swift/SILOptimizer/Analysis/Analysis.h

@@ -137,6 +137,18 @@ class SILAnalysis : public DeleteNotificationHandler {
   /// specific verification will do so.
   virtual void verify(SILFunction *F) const { verify(); }
 
+  /// Perform a potentially more expensive verification of the state of this
+  /// analysis.
+  ///
+  /// The purpose of this is to allow for more expensive verification that is
+  /// fast enough to run at the end of a pass manager once vs in between all
+  /// passes when -sil-verify-all is enabled.
+  ///
+  /// TODO: By default this is a no-op, but really it should call
+  /// verify(). Today doing a full verification seems to catch verification
+  /// errors when compiling the stdlib/overlays.
+  virtual void verifyFull() const {}
+
   /// Verify that the function \p F can be used by the analysis.
   static void verifyFunction(SILFunction *F);
 };

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -568,6 +568,22 @@ void SILPassManager::execute() {
 SILPassManager::~SILPassManager() {
   assert(IRGenPasses.empty() && "Must add IRGen SIL passes that were "
                                 "registered to the list of transformations");
+  // Before we do anything further, verify the module and our analyses. These
+  // are natural points with which to verify.
+  //
+  // TODO: We currently do not verify the module here since the verifier asserts
+  // in the normal build. This should be enabled and those problems resolved
+  // either by changing the verifier or treating those asserts as signs of a
+  // bug.
+  for (auto *A : Analyses) {
+    // We use verify full instead of just verify to ensure that passes that want
+    // to run more expensive verification after a pass manager is destroyed
+    // properly trigger.
+    //
+    // NOTE: verifyFull() has a default implementation that just calls
+    // verify(). So functionally, there is no difference here.
+    A->verifyFull();
+  }
 
   // Remove our deserialization notification handler.
   Mod->removeDeserializationNotificationHandler(