DependencyScanner: inherit ASTContext options when configuring a sub compiler instance for interface scanner. NFC

Author: nkcsgexi

include/swift/Frontend/ModuleInterfaceLoader.h

@@ -124,6 +124,7 @@ namespace swift {
 
 class LangOptions;
 class SearchPathOptions;
+class CompilerInvocation;
 
 /// A ModuleLoader that runs a subordinate \c CompilerInvocation and
 /// \c CompilerInstance to convert .swiftinterface files to .swiftmodule
@@ -210,6 +211,10 @@ bool extractSwiftInterfaceVersionAndArgs(SourceManager &SM,
                                          llvm::StringSaver &SubArgSaver,
                                          SmallVectorImpl<const char *> &SubArgs,
                                          SourceLoc diagnosticLoc = SourceLoc());
+
+void inheritOptionsForBuildingInterface(CompilerInvocation &Invok,
+                                        const SearchPathOptions &SearchPathOpts,
+                                        const LangOptions &LangOpts);
 }
 
 #endif

lib/Frontend/ModuleInterfaceBuilder.cpp

@@ -83,19 +83,37 @@ void ModuleInterfaceBuilder::configureSubInvocationInputsAndOutputs(
   .setMainAndSupplementaryOutputs({MainOut}, {SOPs});
 }
 
-void ModuleInterfaceBuilder::configureSubInvocation(
+void swift::inheritOptionsForBuildingInterface(
+    CompilerInvocation &Invok,
     const SearchPathOptions &SearchPathOpts,
-    const LangOptions &LangOpts,
-    ClangModuleLoader *ClangLoader) {
+    const LangOptions &LangOpts) {
   // Start with a SubInvocation that copies various state from our
   // invoking ASTContext.
-  subInvocation.setImportSearchPaths(SearchPathOpts.ImportSearchPaths);
-  subInvocation.setFrameworkSearchPaths(SearchPathOpts.FrameworkSearchPaths);
-  subInvocation.setSDKPath(SearchPathOpts.SDKPath);
-  subInvocation.setInputKind(InputFileKind::SwiftModuleInterface);
-  subInvocation.setRuntimeResourcePath(SearchPathOpts.RuntimeResourcePath);
-  subInvocation.setTargetTriple(LangOpts.Target);
+  Invok.setImportSearchPaths(SearchPathOpts.ImportSearchPaths);
+  Invok.setFrameworkSearchPaths(SearchPathOpts.FrameworkSearchPaths);
+  Invok.setSDKPath(SearchPathOpts.SDKPath);
+  Invok.setInputKind(InputFileKind::SwiftModuleInterface);
+  Invok.setRuntimeResourcePath(SearchPathOpts.RuntimeResourcePath);
+  Invok.setTargetTriple(LangOpts.Target);
+
+  // Inhibit warnings from the SubInvocation since we are assuming the user
+  // is not in a position to fix them.
+  Invok.getDiagnosticOptions().SuppressWarnings = true;
+
+  // Inherit this setting down so that it can affect error diagnostics (mostly
+  // by making them non-fatal).
+  Invok.getLangOptions().DebuggerSupport = LangOpts.DebuggerSupport;
+
+  // Disable this; deinitializers always get printed with `@objc` even in
+  // modules that don't import Foundation.
+  Invok.getLangOptions().EnableObjCAttrRequiresFoundation = false;
+}
 
+void ModuleInterfaceBuilder::configureSubInvocation(
+    const SearchPathOptions &SearchPathOpts,
+    const LangOptions &LangOpts,
+    ClangModuleLoader *ClangLoader) {
+  inheritOptionsForBuildingInterface(subInvocation, SearchPathOpts, LangOpts);
   subInvocation.setModuleName(moduleName);
   subInvocation.setClangModuleCachePath(moduleCachePath);
   subInvocation.getFrontendOptions().PrebuiltModuleCachePath =
@@ -112,18 +130,6 @@ void ModuleInterfaceBuilder::configureSubInvocation(
     }
   }
 
-  // Inhibit warnings from the SubInvocation since we are assuming the user
-  // is not in a position to fix them.
-  subInvocation.getDiagnosticOptions().SuppressWarnings = true;
-
-  // Inherit this setting down so that it can affect error diagnostics (mostly
-  // by making them non-fatal).
-  subInvocation.getLangOptions().DebuggerSupport = LangOpts.DebuggerSupport;
-
-  // Disable this; deinitializers always get printed with `@objc` even in
-  // modules that don't import Foundation.
-  subInvocation.getLangOptions().EnableObjCAttrRequiresFoundation = false;
-
   // Tell the subinvocation to serialize dependency hashes if asked to do so.
   auto &frontendOpts = subInvocation.getFrontendOptions();
   frontendOpts.SerializeModuleInterfaceDependencyHashes =

lib/FrontendTool/ScanDependencies.cpp

@@ -76,6 +76,9 @@ struct InterfaceSubASTContextDelegate: SubASTContextDelegate {
       return true;
     }
     CompilerInvocation invok;
+
+    // Inherit options from the parent ASTContext so we have all search paths, etc.
+    inheritOptionsForBuildingInterface(invok, ctx.SearchPathOpts, ctx.LangOpts);
     CompilerInstance inst;
     // Use the additional flags to setup the compiler instance.
     if (invok.parseArgs(SubArgs, ctx.Diags)) {