Add swift.disable_clang_spi feature and enable it by default

PiperOrigin-RevId: 523473390 (cherry picked from commit 95231b2) Signed-off-by: Brentley Jones <[email protected]>
bazelbuild · Oct 14, 2024 · 924c1c0 · 924c1c0
1 parent 2acddfe
commit 924c1c0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/swift/internal/feature_names.bzl b/swift/internal/feature_names.bzl
@@ -330,6 +330,10 @@ SWIFT_FEATURE__FORCE_ALWAYSLINK_TRUE = "swift._force_alwayslink_true"
 # enables runtime checking of exclusive memory access on mutation.
 SWIFT_FEATURE_CHECKED_EXCLUSIVITY = "swift.checked_exclusivity"
 
+# If enabled, requests the `-disable-clang-spi` swiftc flag. Disables importing
+# Clang SPIs as Swift SPIs.
+SWIFT_FEATURE_DISABLE_CLANG_SPI = "swift.disable_clang_spi"
+
 # Disables Swift sandbox which prevents issues with nested sandboxing when Swift code contains system-provided macros.
 # If enabled '#Preview' macro provided by SwiftUI fails to build and probably other system-provided macros.
 # Enabled by default for Swift 5.10+ on macOS.

diff --git a/swift/toolchains/config/compile_config.bzl b/swift/toolchains/config/compile_config.bzl
@@ -40,6 +40,7 @@ load(
     "SWIFT_FEATURE_COVERAGE_PREFIX_MAP",
     "SWIFT_FEATURE_DBG",
     "SWIFT_FEATURE_DEBUG_PREFIX_MAP",
+    "SWIFT_FEATURE_DISABLE_CLANG_SPI",
     "SWIFT_FEATURE_DISABLE_SWIFT_SANDBOX",
     "SWIFT_FEATURE_DISABLE_SYSTEM_INDEX",
     "SWIFT_FEATURE_EMIT_BC",
@@ -1130,6 +1131,15 @@ def compile_action_configs(
             configurators = [add_arg("-enable-bare-slash-regex")],
             features = [SWIFT_FEATURE_SUPPORTS_BARE_SLASH_REGEX],
         ),
+        ActionConfigInfo(
+            actions = [
+                SWIFT_ACTION_COMPILE,
+            ],
+            configurators = [add_arg("-Xfrontend", "-disable-clang-spi")],
+            features = [
+                SWIFT_FEATURE_DISABLE_CLANG_SPI,
+            ],
+        ),
     ]
 
     # NOTE: The positions of these action configs in the list are important,

diff --git a/swift/toolchains/swift_toolchain.bzl b/swift/toolchains/swift_toolchain.bzl
@@ -51,6 +51,7 @@ load(
     "SWIFT_FEATURE_CACHEABLE_SWIFTMODULES",
     "SWIFT_FEATURE_COVERAGE_PREFIX_MAP",
     "SWIFT_FEATURE_DEBUG_PREFIX_MAP",
+    "SWIFT_FEATURE_DISABLE_CLANG_SPI",
     "SWIFT_FEATURE_DISABLE_SYSTEM_INDEX",
     "SWIFT_FEATURE_EMIT_SWIFTDOC",
     "SWIFT_FEATURE_EMIT_SWIFTSOURCEINFO",
@@ -464,6 +465,7 @@ def _swift_toolchain_impl(ctx):
         SWIFT_FEATURE_CACHEABLE_SWIFTMODULES,
         SWIFT_FEATURE_COVERAGE_PREFIX_MAP,
         SWIFT_FEATURE_DEBUG_PREFIX_MAP,
+        SWIFT_FEATURE_DISABLE_CLANG_SPI,
         SWIFT_FEATURE_DISABLE_SYSTEM_INDEX,
         SWIFT_FEATURE_EMIT_SWIFTDOC,
         SWIFT_FEATURE_EMIT_SWIFTSOURCEINFO,

diff --git a/swift/toolchains/xcode_swift_toolchain.bzl b/swift/toolchains/xcode_swift_toolchain.bzl
@@ -52,6 +52,7 @@ load(
     "SWIFT_FEATURE_COVERAGE",
     "SWIFT_FEATURE_COVERAGE_PREFIX_MAP",
     "SWIFT_FEATURE_DEBUG_PREFIX_MAP",
+    "SWIFT_FEATURE_DISABLE_CLANG_SPI",
     "SWIFT_FEATURE_DISABLE_SWIFT_SANDBOX",
     "SWIFT_FEATURE_DISABLE_SYSTEM_INDEX",
     "SWIFT_FEATURE_EMIT_SWIFTDOC",
@@ -702,6 +703,7 @@ def _xcode_swift_toolchain_impl(ctx):
         SWIFT_FEATURE_CHECKED_EXCLUSIVITY,
         SWIFT_FEATURE_COVERAGE_PREFIX_MAP,
         SWIFT_FEATURE_DEBUG_PREFIX_MAP,
+        SWIFT_FEATURE_DISABLE_CLANG_SPI,
         SWIFT_FEATURE_DISABLE_SYSTEM_INDEX,
         SWIFT_FEATURE_EMIT_SWIFTDOC,
         SWIFT_FEATURE_EMIT_SWIFTSOURCEINFO,