From a27fe000f2e03a85f28febb35c42e27ee1733974 Mon Sep 17 00:00:00 2001
From: Chandler Carruth <chandlerc@gmail.com>
Date: Thu, 15 Jan 2026 20:05:25 -0800
Subject: [PATCH] Switch sanitizer features to use OS config features (#6609)

This removes another chunk of platform-specific feature construction and
simplifies the code further.

Also removes a now-stale comment about adding more platform-specific
features.

---------

Co-authored-by: Geoff Romer <gromer@google.com>
---
 .../cc_toolchain_sanitizer_features.bzl       | 46 +++++++++----------
 .../clang_cc_toolchain_config.bzl             | 13 +-----
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/bazel/cc_toolchains/cc_toolchain_sanitizer_features.bzl b/bazel/cc_toolchains/cc_toolchain_sanitizer_features.bzl
index 8598d97bfc21..d93c01e9c23c 100644
--- a/bazel/cc_toolchains/cc_toolchain_sanitizer_features.bzl
+++ b/bazel/cc_toolchains/cc_toolchain_sanitizer_features.bzl
@@ -10,6 +10,7 @@ load(
     "feature_set",
     "flag_group",
     "flag_set",
+    "with_feature_set",
 )
 load(
     ":cc_toolchain_actions.bzl",
@@ -20,18 +21,13 @@ load(
 sanitizer_common_flags = feature(
     name = "sanitizer_common_flags",
     implies = ["minimal_debug_info_flags", "preserve_call_stacks"],
-)
-
-# Separated from the feature above so it can only be included on platforms
-# where it is supported. There is no negative flag in Clang so we can't just
-# override it later.
-sanitizer_static_lib_flags = feature(
-    name = "sanitizer_static_lib_flags",
-    enabled = True,
-    requires = [feature_set(["sanitizer_common_flags"])],
     flag_sets = [flag_set(
         actions = all_link_actions,
         flag_groups = [flag_group(flags = ["-static-libsan"])],
+        with_features = [
+            with_feature_set(["linux_target"]),
+            with_feature_set(["freebsd_target"]),
+        ],
     )],
 )
 
@@ -79,20 +75,6 @@ asan_min_size = feature(
     )],
 )
 
-# Likely due to being unable to use the static-linked and up-to-date
-# sanitizer runtimes, we have to disable a number of sanitizers on macOS.
-macos_asan_workarounds = feature(
-    name = "macos_sanitizer_workarounds",
-    enabled = True,
-    requires = [feature_set(["asan"])],
-    flag_sets = [flag_set(
-        actions = all_compile_actions + all_link_actions,
-        flag_groups = [flag_group(flags = [
-            "-fno-sanitize=function",
-        ])],
-    )],
-)
-
 fuzzer = feature(
     name = "fuzzer",
     flag_sets = [flag_set(
@@ -103,6 +85,21 @@ fuzzer = feature(
     )],
 )
 
+sanitizer_workarounds = feature(
+    name = "sanitizer_workarounds",
+    enabled = True,
+    requires = [feature_set(["asan"])],
+    flag_sets = [flag_set(
+        actions = all_compile_actions + all_link_actions,
+        flag_groups = [flag_group(flags = [
+            # Likely due to being unable to use the static-linked and up-to-date
+            # sanitizer runtimes, we have to disable this sanitizer on macOS.
+            "-fno-sanitize=function",
+        ])],
+        with_features = [with_feature_set(["macos_target"])],
+    )],
+)
+
 # Note that the order of features is significant in this list and determines the
 # relative order of flags from the features listed.
 sanitizer_features = [
@@ -110,4 +107,7 @@ sanitizer_features = [
     asan,
     asan_min_size,
     fuzzer,
+
+    # Note that the workarounds must come last here to override earlier flags.
+    sanitizer_workarounds,
 ]
diff --git a/bazel/cc_toolchains/clang_cc_toolchain_config.bzl b/bazel/cc_toolchains/clang_cc_toolchain_config.bzl
index dd4dc051a1e7..8d800d9a700f 100644
--- a/bazel/cc_toolchains/clang_cc_toolchain_config.bzl
+++ b/bazel/cc_toolchains/clang_cc_toolchain_config.bzl
@@ -47,12 +47,7 @@ load(
     "optimization_features",
     "x86_64_cpu_flags",
 )
-load(
-    ":cc_toolchain_sanitizer_features.bzl",
-    "macos_asan_workarounds",
-    "sanitizer_features",
-    "sanitizer_static_lib_flags",
-)
+load(":cc_toolchain_sanitizer_features.bzl", "sanitizer_features")
 load(
     ":cc_toolchain_tools.bzl",
     "llvm_action_configs",
@@ -161,18 +156,12 @@ def _build_features(ctx):
     # Next, add the features based on the target platform. Here too the
     # features are order sensitive.
     if ctx.attr.target_os == "linux":
-        features.append(sanitizer_static_lib_flags)
         sysroot = None
     elif ctx.attr.target_os == "windows":
-        # TODO: Need to figure out if we need to add windows specific features
-        # I think the .pdb debug files will need to be handled differently,
-        # so that might be an example where a feature must be added.
         sysroot = None
     elif ctx.attr.target_os == "macos":
-        features.append(macos_asan_workarounds)
         sysroot = sysroot_dir
     elif ctx.attr.target_os == "freebsd":
-        features.append(sanitizer_static_lib_flags)
         sysroot = sysroot_dir
     else:
         fail("Unsupported target OS!")