Merge pull request #69730 from chelcassanova/lldb-swift-progress-reports

[ASTContext] Add setter for PreModuleImportCallback

Author: chelcassanova

include/swift/AST/ASTContext.h

@@ -239,8 +239,8 @@ class ASTContext final {
       ClangImporterOptions &ClangImporterOpts,
       symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
       SourceManager &SourceMgr, DiagnosticEngine &Diags,
-      llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutBackend = nullptr,
-      std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback = {});
+      llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutBackend = nullptr
+      );
 
 public:
   // Members that should only be used by ASTContext.cpp.
@@ -257,8 +257,8 @@ class ASTContext final {
       ClangImporterOptions &ClangImporterOpts,
       symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
       SourceManager &SourceMgr, DiagnosticEngine &Diags,
-      llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutBackend = nullptr,
-      std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback = {});
+      llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutBackend = nullptr
+      );
   ~ASTContext();
 
   /// Optional table of counters to report, nullptr when not collecting.
@@ -294,6 +294,11 @@ class ASTContext final {
   /// OutputBackend for writing outputs.
   llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutputBackend;
 
+  /// Set the callback function that is invoked before Swift module importing is
+  /// performed
+  void SetPreModuleImportCallback(
+      std::function<void(llvm::StringRef ModuleName, bool IsOverlay)> callback);
+
   /// If the shared pointer is not a \c nullptr and the pointee is \c true,
   /// all operations working on this ASTContext should be aborted at the next
   /// possible opportunity.
@@ -404,7 +409,7 @@ class ASTContext final {
   getAllocator(AllocationArena arena = AllocationArena::Permanent) const;
 
   /// An optional generic callback function invoked prior to importing a module.
-  mutable std::function<bool(llvm::StringRef ModuleName, bool IsOverlay)>
+  mutable std::function<void(llvm::StringRef ModuleName, bool IsOverlay)>
       PreModuleImportCallback;
 
 public:

lib/AST/ASTContext.cpp

@@ -646,8 +646,7 @@ ASTContext *ASTContext::get(
     ClangImporterOptions &ClangImporterOpts,
     symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
     SourceManager &SourceMgr, DiagnosticEngine &Diags,
-    llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutputBackend,
-    std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback) {
+    llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutputBackend) {
   // If more than two data structures are concatentated, then the aggregate
   // size math needs to become more complicated due to per-struct alignment
   // constraints.
@@ -661,7 +660,7 @@ ASTContext *ASTContext::get(
   return new (mem)
       ASTContext(langOpts, typecheckOpts, silOpts, SearchPathOpts,
                  ClangImporterOpts, SymbolGraphOpts, SourceMgr, Diags,
-                 std::move(OutputBackend), PreModuleImportCallback);
+                 std::move(OutputBackend));
 }
 
 ASTContext::ASTContext(
@@ -670,16 +669,15 @@ ASTContext::ASTContext(
     ClangImporterOptions &ClangImporterOpts,
     symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
     SourceManager &SourceMgr, DiagnosticEngine &Diags,
-    llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutBackend,
-    std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback)
+    llvm::IntrusiveRefCntPtr<llvm::vfs::OutputBackend> OutBackend
+    )
     : LangOpts(langOpts), TypeCheckerOpts(typecheckOpts), SILOpts(silOpts),
       SearchPathOpts(SearchPathOpts), ClangImporterOpts(ClangImporterOpts),
       SymbolGraphOpts(SymbolGraphOpts), SourceMgr(SourceMgr), Diags(Diags),
       OutputBackend(std::move(OutBackend)), evaluator(Diags, langOpts),
       TheBuiltinModule(createBuiltinModule(*this)),
       StdlibModuleName(getIdentifier(STDLIB_NAME)),
       SwiftShimsModuleName(getIdentifier(SWIFT_SHIMS_NAME)),
-      PreModuleImportCallback(PreModuleImportCallback),
       TheErrorType(new (*this, AllocationArena::Permanent) ErrorType(
           *this, Type(), RecursiveTypeProperties::HasError)),
       TheUnresolvedType(new(*this, AllocationArena::Permanent)
@@ -731,6 +729,11 @@ ASTContext::~ASTContext() {
   getImpl().~Implementation();
 }
 
+void ASTContext::SetPreModuleImportCallback(
+    std::function<void(llvm::StringRef ModuleName, bool IsOverlay)> callback) {
+  PreModuleImportCallback = callback;
+}
+
 llvm::BumpPtrAllocator &ASTContext::getAllocator(AllocationArena arena) const {
   switch (arena) {
   case AllocationArena::Permanent: