Revert "[AST] Add mechanism to notify module loading to other clients"

This reverts commit 38146fc.

Author: medismailben

include/swift/AST/ASTContext.h

@@ -223,13 +223,11 @@ class ASTContext final {
   ASTContext(const ASTContext&) = delete;
   void operator=(const ASTContext&) = delete;
 
-  ASTContext(
-      LangOptions &langOpts, TypeCheckerOptions &typeckOpts,
-      SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
-      ClangImporterOptions &ClangImporterOpts,
-      symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
-      SourceManager &SourceMgr, DiagnosticEngine &Diags,
-      std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback = {});
+  ASTContext(LangOptions &langOpts, TypeCheckerOptions &typecheckOpts,
+             SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
+             ClangImporterOptions &ClangImporterOpts,
+             symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
+             SourceManager &SourceMgr, DiagnosticEngine &Diags);
 
 public:
   // Members that should only be used by ASTContext.cpp.
@@ -240,13 +238,11 @@ class ASTContext final {
 
   void operator delete(void *Data) throw();
 
-  static ASTContext *
-  get(LangOptions &langOpts, TypeCheckerOptions &typeckOpts,
-      SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
-      ClangImporterOptions &ClangImporterOpts,
-      symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
-      SourceManager &SourceMgr, DiagnosticEngine &Diags,
-      std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback = {});
+  static ASTContext *get(LangOptions &langOpts, TypeCheckerOptions &typecheckOpts,
+                         SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
+                         ClangImporterOptions &ClangImporterOpts,
+                         symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
+                         SourceManager &SourceMgr, DiagnosticEngine &Diags);
   ~ASTContext();
 
   /// Optional table of counters to report, nullptr when not collecting.
@@ -378,10 +374,6 @@ class ASTContext final {
   llvm::BumpPtrAllocator &
   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)>
-      PreModuleImportCallback;
-
 public:
   /// Allocate - Allocate memory from the ASTContext bump pointer.
   void *Allocate(unsigned long bytes, unsigned alignment,
@@ -1115,9 +1107,6 @@ class ASTContext final {
   /// If a module by this name has already been loaded, the existing module will
   /// be returned.
   ///
-  /// \param ModulePath The module's \c ImportPath which describes
-  /// the name of the module being loaded, possibly including submodules.
-
   /// \returns The requested module, or NULL if the module cannot be found.
   ModuleDecl *getModule(ImportPath::Module ModulePath);
 

lib/AST/ASTContext.cpp

@@ -42,8 +42,8 @@
 #include "swift/AST/PropertyWrappers.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/RawComment.h"
-#include "swift/AST/SILLayout.h"
 #include "swift/AST/SearchPathOptions.h"
+#include "swift/AST/SILLayout.h"
 #include "swift/AST/SemanticAttrs.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/AST/SubstitutionMap.h"
@@ -65,7 +65,6 @@
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/Compiler.h"
-#include "llvm/Support/FormatVariadic.h"
 #include <algorithm>
 #include <memory>
 
@@ -579,13 +578,13 @@ void ASTContext::operator delete(void *Data) throw() {
   AlignedFree(Data);
 }
 
-ASTContext *ASTContext::get(
-    LangOptions &langOpts, TypeCheckerOptions &typeckOpts, SILOptions &silOpts,
-    SearchPathOptions &SearchPathOpts, ClangImporterOptions &ClangImporterOpts,
-    symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
-    SourceManager &SourceMgr, DiagnosticEngine &Diags,
-    std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback) {
-  // If more than two data structures are concatentated, then the aggregate
+ASTContext *ASTContext::get(LangOptions &langOpts,
+                            TypeCheckerOptions &typecheckOpts, SILOptions &silOpts,
+                            SearchPathOptions &SearchPathOpts,
+                            ClangImporterOptions &ClangImporterOpts,
+                            symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
+                            SourceManager &SourceMgr, DiagnosticEngine &Diags) {
+  // If more than two data structures are concatenated, then the aggregate
   // size math needs to become more complicated due to per-struct alignment
   // constraints.
   auto align = std::max(alignof(ASTContext), alignof(Implementation));
@@ -595,21 +594,19 @@ ASTContext *ASTContext::get(
   impl = reinterpret_cast<void *>(
       llvm::alignAddr(impl, llvm::Align(alignof(Implementation))));
   new (impl) Implementation();
-  return new (mem) ASTContext(langOpts, typeckOpts, silOpts, SearchPathOpts,
-                              ClangImporterOpts, SymbolGraphOpts, SourceMgr,
-                              Diags, PreModuleImportCallback);
+  return new (mem)
+      ASTContext(langOpts, typecheckOpts, silOpts, SearchPathOpts,
+                 ClangImporterOpts, SymbolGraphOpts, SourceMgr, Diags);
 }
 
-ASTContext::ASTContext(
-    LangOptions &langOpts, TypeCheckerOptions &typeckOpts, SILOptions &silOpts,
-    SearchPathOptions &SearchPathOpts, ClangImporterOptions &ClangImporterOpts,
-    symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
-    SourceManager &SourceMgr, DiagnosticEngine &Diags,
-    std::function<bool(llvm::StringRef, bool)> PreModuleImportCallback)
+ASTContext::ASTContext(LangOptions &langOpts, TypeCheckerOptions &typecheckOpts,
+                       SILOptions &silOpts, SearchPathOptions &SearchPathOpts,
+                       ClangImporterOptions &ClangImporterOpts,
+                       symbolgraphgen::SymbolGraphOptions &SymbolGraphOpts,
+                       SourceManager &SourceMgr, DiagnosticEngine &Diags)
     : LangOpts(langOpts), TypeCheckerOpts(typecheckOpts), SILOpts(silOpts),
       SearchPathOpts(SearchPathOpts), ClangImporterOpts(ClangImporterOpts),
       SymbolGraphOpts(SymbolGraphOpts), SourceMgr(SourceMgr), Diags(Diags),
-      PreModuleImportCallback(PreModuleImportCallback),
       evaluator(Diags, langOpts), TheBuiltinModule(createBuiltinModule(*this)),
       StdlibModuleName(getIdentifier(STDLIB_NAME)),
       SwiftShimsModuleName(getIdentifier(SWIFT_SHIMS_NAME)),
@@ -625,18 +622,18 @@ ASTContext::ASTContext(
     The##SHORT_ID##Type(new (*this, AllocationArena::Permanent) \
                           ID##Type(*this)),
 #include "swift/AST/TypeNodes.def"
-      TheIEEE32Type(new (*this, AllocationArena::Permanent)
-                        BuiltinFloatType(BuiltinFloatType::IEEE32, *this)),
-      TheIEEE64Type(new (*this, AllocationArena::Permanent)
-                        BuiltinFloatType(BuiltinFloatType::IEEE64, *this)),
-      TheIEEE16Type(new (*this, AllocationArena::Permanent)
-                        BuiltinFloatType(BuiltinFloatType::IEEE16, *this)),
-      TheIEEE80Type(new (*this, AllocationArena::Permanent)
-                        BuiltinFloatType(BuiltinFloatType::IEEE80, *this)),
-      TheIEEE128Type(new (*this, AllocationArena::Permanent)
-                         BuiltinFloatType(BuiltinFloatType::IEEE128, *this)),
-      ThePPC128Type(new (*this, AllocationArena::Permanent)
-                        BuiltinFloatType(BuiltinFloatType::PPC128, *this)) {
+    TheIEEE32Type(new (*this, AllocationArena::Permanent)
+                    BuiltinFloatType(BuiltinFloatType::IEEE32,*this)),
+    TheIEEE64Type(new (*this, AllocationArena::Permanent)
+                    BuiltinFloatType(BuiltinFloatType::IEEE64,*this)),
+    TheIEEE16Type(new (*this, AllocationArena::Permanent)
+                    BuiltinFloatType(BuiltinFloatType::IEEE16,*this)),
+    TheIEEE80Type(new (*this, AllocationArena::Permanent)
+                    BuiltinFloatType(BuiltinFloatType::IEEE80,*this)),
+    TheIEEE128Type(new (*this, AllocationArena::Permanent)
+                    BuiltinFloatType(BuiltinFloatType::IEEE128, *this)),
+    ThePPC128Type(new (*this, AllocationArena::Permanent)
+                    BuiltinFloatType(BuiltinFloatType::PPC128, *this)) {
 
   // Initialize all of the known identifiers.
 #define IDENTIFIER_WITH_NAME(Name, IdStr) Id_##Name = getIdentifier(IdStr);
@@ -2214,8 +2211,6 @@ ASTContext::getModule(ImportPath::Module ModulePath) {
     return M;
 
   auto moduleID = ModulePath[0];
-  if (PreModuleImportCallback)
-    PreModuleImportCallback(moduleID.Item.str(), false /*=IsOverlay*/);
   for (auto &importer : getImpl().ModuleLoaders) {
     if (ModuleDecl *M = importer->loadModule(moduleID.Loc, ModulePath)) {
       if (LangOpts.EnableModuleLoadingRemarks) {
@@ -2240,17 +2235,12 @@ ModuleDecl *ASTContext::getOverlayModule(const FileUnit *FU) {
       return Existing;
   }
 
-  if (PreModuleImportCallback) {
-    SmallString<16> path;
-    ModPath.getString(path);
-    if (!path.empty())
-      PreModuleImportCallback(path.str(), /*IsOverlay=*/true);
-  }
   for (auto &importer : getImpl().ModuleLoaders) {
     if (importer.get() == getClangModuleLoader())
       continue;
-    if (ModuleDecl *M = importer->loadModule(SourceLoc(), ModPath))
+    if (ModuleDecl *M = importer->loadModule(SourceLoc(), ModPath)) {
       return M;
+    }
   }
 
   return nullptr;