Keep the memory allocator local to module loaders, instead of module map parser.

Author: artemcm

include/swift/Frontend/ModuleInterfaceLoader.h

@@ -191,7 +191,7 @@ struct ExplicitModuleInfo {
 //  ]
 class ExplicitModuleMapParser {
 public:
-  ExplicitModuleMapParser(ASTContext &Ctx) : Ctx(Ctx), Saver(Allocator) {}
+  ExplicitModuleMapParser(llvm::BumpPtrAllocator &Allocator) : Saver(Allocator) {}
 
   std::error_code
   parseSwiftExplicitModuleMap(const StringRef fileName,
@@ -201,9 +201,6 @@ class ExplicitModuleMapParser {
   StringRef getScalaNodeText(llvm::yaml::Node *N);
   bool parseSingleModuleEntry(llvm::yaml::Node &node,
                               llvm::StringMap<ExplicitModuleInfo> &moduleMap);
-
-  ASTContext &Ctx;
-  llvm::BumpPtrAllocator Allocator;
   llvm::StringSaver Saver;
 };
 

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -1513,11 +1513,12 @@ bool InterfaceSubContextDelegateImpl::runInSubCompilerInstance(StringRef moduleN
 
 struct ExplicitSwiftModuleLoader::Implementation {
   ASTContext &Ctx;
+  llvm::BumpPtrAllocator Allocator;
   llvm::StringMap<ExplicitModuleInfo> ExplicitModuleMap;
   Implementation(ASTContext &Ctx) : Ctx(Ctx) {}
 
   void parseSwiftExplicitModuleMap(StringRef fileName) {
-    ExplicitModuleMapParser parser(Ctx);
+    ExplicitModuleMapParser parser(Allocator);
     auto result =
         parser.parseSwiftExplicitModuleMap(fileName, ExplicitModuleMap);
     if (result == std::errc::invalid_argument)
@@ -1587,8 +1588,6 @@ std::error_code ExplicitModuleMapParser::parseSwiftExplicitModuleMap(
         }
       }
     } else {
-      Ctx.Diags.diagnose(SourceLoc(), diag::explicit_swift_module_map_corrupted,
-                         fileName);
       return std::make_error_code(std::errc::invalid_argument);
     }
   }

lib/Serialization/ModuleDependencyScanner.cpp

@@ -102,6 +102,7 @@ class ExternalSwiftModuleStubScanner : public ModuleDependencyScanner {
   /// Scan the given external module map
   void parseExternalModuleMap(StringRef fileName);
   llvm::StringMap<ExplicitModuleInfo> ExternalDependencyModuleMap;
+  llvm::BumpPtrAllocator Allocator;
 
 public:
   ExternalSwiftModuleStubScanner(ASTContext &ctx, ModuleLoadingMode LoadMode,
@@ -139,17 +140,11 @@ class ExternalSwiftModuleStubScanner : public ModuleDependencyScanner {
     this->dependencies = std::move(dependencies);
     return std::error_code{};
   }
-
-public:
-  static std::unique_ptr<ExternalSwiftModuleStubScanner>
-  create(ASTContext &ctx, DependencyTracker *tracker,
-         ModuleLoadingMode loadMode, StringRef ExternalDependencyModuleMap,
-         bool IgnoreSwiftSourceInfoFile);
 };
 } // namespace
 
 void ExternalSwiftModuleStubScanner::parseExternalModuleMap(StringRef fileName) {
-  ExplicitModuleMapParser parser(Ctx);
+  ExplicitModuleMapParser parser(Allocator);
   auto result =
       parser.parseSwiftExplicitModuleMap(fileName, ExternalDependencyModuleMap);
   if (result == std::errc::invalid_argument)