Merge pull request #38710 from nkcsgexi/clean-ExplicitModulePaths

Frontend: remove -swift-module-file. NFC

Author: nkcsgexi

include/swift/AST/SearchPathOptions.h

@@ -82,9 +82,6 @@ class SearchPathOptions {
   /// would for a non-system header.
   bool DisableModulesValidateSystemDependencies = false;
 
-  /// The paths to a set of explicitly built modules from interfaces.
-  std::vector<std::string> ExplicitSwiftModules;
-
   /// A set of compiled modules that may be ready to use.
   std::vector<std::string> CandidateCompiledModules;
 

include/swift/Frontend/ModuleInterfaceLoader.h

@@ -161,7 +161,6 @@ class ExplicitSwiftModuleLoader: public SerializedModuleLoaderBase {
   static std::unique_ptr<ExplicitSwiftModuleLoader>
   create(ASTContext &ctx,
          DependencyTracker *tracker, ModuleLoadingMode loadMode,
-         ArrayRef<std::string> ExplicitModulePaths,
          StringRef ExplicitSwiftModuleMap,
          bool IgnoreSwiftSourceInfoFile);
 
@@ -180,8 +179,6 @@ struct ExplicitModuleInfo {
   std::string moduleDocPath;
   // Path of the .swiftsourceinfo file.
   std::string moduleSourceInfoPath;
-  // Opened buffer for the .swiftmodule file.
-  std::unique_ptr<llvm::MemoryBuffer> moduleBuffer;
   // A flag that indicates whether this module is a framework
   bool isFramework;
 };

include/swift/Option/FrontendOptions.td

@@ -169,10 +169,6 @@ def disable_typo_correction : Flag<["-"], "disable-typo-correction">,
 def disable_implicit_swift_modules: Flag<["-"], "disable-implicit-swift-modules">,
   HelpText<"Disable building Swift modules implicitly by the compiler">;
 
-def swift_module_file
-  : Separate<["-"], "swift-module-file">, MetaVarName<"<path>">,
-    HelpText<"Specify Swift module explicitly built from textual interface">;
-
 def explict_swift_module_map
   : Separate<["-"], "explicit-swift-module-map-file">, MetaVarName<"<path>">,
     HelpText<"Specify a JSON file containing information of explict Swift modules">;

lib/Frontend/CompilerInvocation.cpp

@@ -1098,9 +1098,6 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts,
   Opts.DisableModulesValidateSystemDependencies |=
       Args.hasArg(OPT_disable_modules_validate_system_headers);
 
-  for (auto A: Args.filtered(OPT_swift_module_file)) {
-    Opts.ExplicitSwiftModules.push_back(resolveSearchPath(A->getValue()));
-  }
   if (const Arg *A = Args.getLastArg(OPT_explict_swift_module_map))
     Opts.ExplicitSwiftModuleMap = A->getValue();
   for (auto A: Args.filtered(OPT_candidate_module_file)) {

lib/Frontend/Frontend.cpp

@@ -546,7 +546,6 @@ bool CompilerInstance::setUpModuleLoaders() {
     auto ESML = ExplicitSwiftModuleLoader::create(
         *Context,
         getDependencyTracker(), MLM,
-        Invocation.getSearchPathOptions().ExplicitSwiftModules,
         Invocation.getSearchPathOptions().ExplicitSwiftModuleMap,
         IgnoreSourceInfoFile);
     this->DefaultSerializedLoader = ESML.get();

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -1441,8 +1441,6 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
     genericSubInvocation.getFrontendOptions().DisableImplicitModules = true;
     GenericArgs.push_back("-disable-implicit-swift-modules");
   }
-  genericSubInvocation.getSearchPathOptions().ExplicitSwiftModules =
-    searchPathOpts.ExplicitSwiftModules;
   // Pass down -explicit-swift-module-map-file
   // FIXME: we shouldn't need this. Remove it?
   StringRef explictSwiftModuleMap = searchPathOpts.ExplicitSwiftModuleMap;
@@ -1721,12 +1719,6 @@ bool ExplicitSwiftModuleLoader::findModule(ImportPath::Element ModuleID,
     return false;
   }
   auto &moduleInfo = it->getValue();
-  if (moduleInfo.moduleBuffer) {
-    // We found an explicit module matches the given name, give the buffer
-    // back to the caller side.
-    *ModuleBuffer = std::move(moduleInfo.moduleBuffer);
-    return true;
-  }
 
   // Set IsFramework bit according to the moduleInfo
   IsFramework = moduleInfo.isFramework;
@@ -1815,7 +1807,6 @@ void ExplicitSwiftModuleLoader::collectVisibleTopLevelModuleNames(
 std::unique_ptr<ExplicitSwiftModuleLoader>
 ExplicitSwiftModuleLoader::create(ASTContext &ctx,
     DependencyTracker *tracker, ModuleLoadingMode loadMode,
-    ArrayRef<std::string> ExplicitModulePaths,
     StringRef ExplicitSwiftModuleMap,
     bool IgnoreSwiftSourceInfoFile) {
   auto result = std::unique_ptr<ExplicitSwiftModuleLoader>(
@@ -1827,24 +1818,6 @@ ExplicitSwiftModuleLoader::create(ASTContext &ctx,
     // Parse a JSON file to collect explicitly built modules.
     Impl.parseSwiftExplicitModuleMap(ExplicitSwiftModuleMap);
   }
-  // Collect .swiftmodule paths from -swift-module-path
-  // FIXME: remove these.
-  for (auto path: ExplicitModulePaths) {
-    std::string name;
-    // Load the explicit module into a buffer and get its name.
-    std::unique_ptr<llvm::MemoryBuffer> buffer = getModuleName(ctx, path, name);
-    if (buffer) {
-      // Register this module for future loading.
-      auto &entry = Impl.ExplicitModuleMap[name];
-      entry.modulePath = path;
-      entry.moduleBuffer = std::move(buffer);
-    } else {
-      // We cannot read the module content, diagnose.
-      ctx.Diags.diagnose(SourceLoc(),
-                         diag::error_opening_explicit_module_file,
-                         path);
-    }
-  }
 
   return result;
 }

lib/Serialization/ModuleDependencyScanner.cpp

@@ -86,9 +86,6 @@ std::error_code PlaceholderSwiftModuleScanner::findModuleFilesInDirectory(
     return std::make_error_code(std::errc::not_supported);
   }
   auto &moduleInfo = it->getValue();
-  assert(!moduleInfo.moduleBuffer &&
-         "Placeholder dependency module stubs cannot have an associated buffer");
-
   auto dependencies = ModuleDependencies::forPlaceholderSwiftModuleStub(
       moduleInfo.modulePath, moduleInfo.moduleDocPath,
       moduleInfo.moduleSourceInfoPath);