Merge pull request #65031 from nkcsgexi/interface-building-inherit-block

ModuleInterface: pass down block list file paths to module interface building context and command lines

Author: nkcsgexi

lib/Frontend/CompilerInvocation.cpp

@@ -1177,7 +1177,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
 
   Opts.DumpTypeWitnessSystems = Args.hasArg(OPT_dump_type_witness_systems);
 
-  Opts.BlocklistConfigFilePaths = FrontendOpts.BlocklistConfigFilePaths;
+  for (auto &block: FrontendOpts.BlocklistConfigFilePaths)
+    Opts.BlocklistConfigFilePaths.push_back(block);
   if (const Arg *A = Args.getLastArg(options::OPT_concurrency_model)) {
     Opts.ActiveConcurrencyModel =
         llvm::StringSwitch<ConcurrencyModel>(A->getValue())

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -1697,6 +1697,13 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
   // module cache path at this point.
   if (buildModuleCacheDirIfAbsent && !moduleCachePath.empty())
     (void)llvm::sys::fs::create_directories(moduleCachePath);
+
+  // Inherit all block list configuration files
+  frontendOpts.BlocklistConfigFilePaths = langOpts.BlocklistConfigFilePaths;
+  for (auto &blocklist: langOpts.BlocklistConfigFilePaths) {
+    GenericArgs.push_back("-blocklist-file");
+    GenericArgs.push_back(blocklist);
+  }
 }
 
 /// Calculate an output filename in \p genericSubInvocation's cache path that

test/ScanDependencies/blocklist-path-pass-down.swift

@@ -0,0 +1,23 @@
+// REQUIRES: objc_interop
+// RUN: %empty-directory(%t)
+// RUN: mkdir -p %t/clang-module-cache
+// RUN: mkdir -p %t/Frameworks
+// RUN: mkdir -p %t/Frameworks/E.framework/
+// RUN: mkdir -p %t/Frameworks/E.framework/Modules
+// RUN: mkdir -p %t/Frameworks/E.framework/Modules/E.swiftmodule
+
+// RUN: echo "---" > %t/blocklist.yml
+// RUN: echo "action:" >> %t/blocklist.yml
+
+// Copy over the interface
+// RUN: cp %S/Inputs/Swift/E.swiftinterface %t/Frameworks/E.framework/Modules/E.swiftmodule/%module-target-triple.swiftinterface
+
+
+// Run the scan
+// RUN: %target-swift-frontend -scan-dependencies %s -o %t/deps.json -F %t/Frameworks/ -sdk %t -blocklist-file %t/blocklist.yml
+// RUN: %FileCheck %s < %t/deps.json
+
+import E
+
+// CHECK: "-blocklist-file"
+// CHECK-NEXT: {{.*}}blocklist.yml"