Merge pull request #42154 from nkcsgexi/disable-clang-spi-propogate

Author: nkcsgexi

lib/Frontend/CompilerInvocation.cpp

@@ -1197,7 +1197,9 @@ static bool ParseClangImporterArgs(ClangImporterOptions &Opts,
 
   Opts.DisableOverlayModules |= Args.hasArg(OPT_emit_imported_modules);
 
-  Opts.EnableClangSPI = !Args.hasArg(OPT_disable_clang_spi);
+  if (Args.hasArg(OPT_disable_clang_spi)) {
+    Opts.EnableClangSPI = false;
+  }
 
   Opts.ExtraArgsOnly |= Args.hasArg(OPT_extra_clang_options_only);
 

lib/Frontend/ModuleInterfaceLoader.cpp

@@ -1493,6 +1493,11 @@ InterfaceSubContextDelegateImpl::InterfaceSubContextDelegateImpl(
     }
   }
 
+  subClangImporterOpts.EnableClangSPI = clangImporterOpts.EnableClangSPI;
+  if (!subClangImporterOpts.EnableClangSPI) {
+    GenericArgs.push_back("-disable-clang-spi");
+  }
+
   // Tell the genericSubInvocation to serialize dependency hashes if asked to do
   // so.
   auto &frontendOpts = genericSubInvocation.getFrontendOptions();

test/ModuleInterface/spi-available-interface.swift

@@ -0,0 +1,20 @@
+// REQUIRES: OS=macosx
+// RUN: %empty-directory(%t/inputs)
+// RUN: %target-swift-frontend -typecheck %s -F %S/../ClangImporter/Inputs/frameworks -DFoo -emit-module-interface-path %t/inputs/Foo.swiftinterface -module-name Foo -enable-library-evolution -disable-clang-spi
+
+// RUN: %target-swift-frontend -typecheck %s -F %S/../ClangImporter/Inputs/frameworks -enable-library-evolution -I %t/inputs -disable-clang-spi
+
+// RUN: %target-swift-frontend -typecheck-module-from-interface %t/inputs/Foo.swiftinterface -F %S/../ClangImporter/Inputs/frameworks -disable-clang-spi
+
+
+#if Foo
+
+import SPIContainer
+
+public func bar(_ c: SPIInterface1) {}
+
+#else
+
+import Foo
+
+#endif