Frontend: move ExplicitSwiftModules into SearchPathOptions, NFC

Author: nkcsgexi

include/swift/AST/SearchPathOptions.h

@@ -82,6 +82,9 @@ 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;
+
 private:
   static StringRef
   pathStringFromFrameworkSearchPath(const FrameworkSearchPath &next) {

include/swift/Frontend/FrontendOptions.h

@@ -262,9 +262,6 @@ class FrontendOptions {
   /// built and given to the compiler invocation.
   bool DisableImplicitModules = false;
 
-  /// The paths to a set of explicitly built modules from interfaces.
-  std::vector<std::string> ExplicitSwiftModules;
-
   /// The different modes for validating TBD against the LLVM IR.
   enum class TBDValidationMode {
     Default,        ///< Do the default validation for the current platform.

include/swift/Frontend/ModuleInterfaceLoader.h

@@ -131,12 +131,10 @@ struct ModuleInterfaceLoaderOptions {
   bool remarkOnRebuildFromInterface = false;
   bool disableInterfaceLock = false;
   bool disableImplicitSwiftModule = false;
-  std::vector<std::string> explicitSwiftModules;
   ModuleInterfaceLoaderOptions(const FrontendOptions &Opts):
     remarkOnRebuildFromInterface(Opts.RemarkOnRebuildFromModuleInterface),
     disableInterfaceLock(Opts.DisableInterfaceFileLock),
-    disableImplicitSwiftModule(Opts.DisableImplicitModules),
-    explicitSwiftModules(Opts.ExplicitSwiftModules) {}
+    disableImplicitSwiftModule(Opts.DisableImplicitModules) {}
   ModuleInterfaceLoaderOptions() = default;
 };
 /// A ModuleLoader that runs a subordinate \c CompilerInvocation and

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -85,10 +85,6 @@ bool ArgsToFrontendOptionsConverter::convert(
 
   Opts.DisableImplicitModules |= Args.hasArg(OPT_disable_implicit_swift_modules);
 
-  for (auto A: Args.getAllArgValues(OPT_swift_module_file_EQ)) {
-    Opts.ExplicitSwiftModules.push_back(A);
-  }
-
   // Always track system dependencies when scanning dependencies.
   if (const Arg *ModeArg = Args.getLastArg(OPT_modes_Group)) {
     if (ModeArg->getOption().matches(OPT_scan_dependencies))

lib/Frontend/CompilerInvocation.cpp

@@ -865,6 +865,9 @@ static bool ParseSearchPathArgs(SearchPathOptions &Opts,
   Opts.DisableModulesValidateSystemDependencies |=
       Args.hasArg(OPT_disable_modules_validate_system_headers);
 
+  for (auto A: Args.filtered(OPT_swift_module_file_EQ)) {
+    Opts.ExplicitSwiftModules.push_back(resolveSearchPath(A->getValue()));
+  }
   // Opts.RuntimeIncludePath is set by calls to
   // setRuntimeIncludePath() or setMainExecutablePath().
   // Opts.RuntimeImportPath is set by calls to

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -1201,12 +1201,12 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
     subInvocation.getFrontendOptions().DisableImplicitModules = true;
     GenericArgs.push_back("-disable-implicit-swift-modules");
   }
-  subInvocation.getFrontendOptions().ExplicitSwiftModules =
-    LoaderOpts.explicitSwiftModules;
+  subInvocation.getSearchPathOptions().ExplicitSwiftModules =
+    searchPathOpts.ExplicitSwiftModules;
   // Dependencies scanner shouldn't know any explict Swift modules to use.
   // Adding these argumnets may not be necessary.
   // FIXME: remove it?
-  for (auto EM: LoaderOpts.explicitSwiftModules) {
+  for (auto EM: searchPathOpts.ExplicitSwiftModules) {
     GenericArgs.push_back(ArgSaver.save((llvm::Twine("-swift-module-file=") + EM).str()));
   }
   if (clangImporter) {