sanitizers: Stabilize AddressSanitizer and LeakSanitizer

rcvalle · rcvalle · commit 5cd80b6443a7 · 2025-06-26T14:19:52.000Z
Stabilize AddressSanitizer and LeakSanitizer for the Tier 1 targets that
support them.
diff --git a/compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs b/compiler/rustc_target/src/spec/targets/aarch64_apple_darwin.rs
@@ -21,6 +21,7 @@ pub(crate) fn target() -> Target {
             max_atomic_width: Some(128),
             // FIXME: The leak sanitizer currently fails the tests, see #88132.
             supported_sanitizers: SanitizerSet::ADDRESS | SanitizerSet::CFI | SanitizerSet::THREAD,
+            stable_sanitizers: SanitizerSet::ADDRESS,
             supports_xray: true,
             ..opts
         },
diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_gnu.rs
@@ -25,12 +25,13 @@ pub(crate) fn target() -> Target {
             stack_probes: StackProbeType::Inline,
             supported_sanitizers: SanitizerSet::ADDRESS
                 | SanitizerSet::CFI
+                | SanitizerSet::HWADDRESS
                 | SanitizerSet::KCFI
                 | SanitizerSet::LEAK
                 | SanitizerSet::MEMORY
                 | SanitizerSet::MEMTAG
-                | SanitizerSet::THREAD
-                | SanitizerSet::HWADDRESS,
+                | SanitizerSet::THREAD,
+            stable_sanitizers: SanitizerSet::ADDRESS | SanitizerSet::LEAK,
             supports_xray: true,
             ..base::linux_gnu::opts()
         },
diff --git a/compiler/rustc_target/src/spec/targets/i686_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/i686_pc_windows_msvc.rs
@@ -6,6 +6,7 @@ pub(crate) fn target() -> Target {
     base.cpu = "pentium4".into();
     base.max_atomic_width = Some(64);
     base.supported_sanitizers = SanitizerSet::ADDRESS;
+    base.stable_sanitizers = SanitizerSet::ADDRESS;
 
     base.add_pre_link_args(
         LinkerFlavor::Msvc(Lld::No),
diff --git a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs
@@ -19,6 +19,7 @@ pub(crate) fn target() -> Target {
     base.cpu = "pentium4".into();
     base.max_atomic_width = Some(64);
     base.supported_sanitizers = SanitizerSet::ADDRESS;
+    base.stable_sanitizers = SanitizerSet::ADDRESS;
     base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]);
     base.stack_probes = StackProbeType::Inline;
 
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_apple_darwin.rs b/compiler/rustc_target/src/spec/targets/x86_64_apple_darwin.rs
@@ -22,6 +22,7 @@ pub(crate) fn target() -> Target {
                 | SanitizerSet::CFI
                 | SanitizerSet::LEAK
                 | SanitizerSet::THREAD,
+            stable_sanitizers: SanitizerSet::ADDRESS | SanitizerSet::LEAK,
             supports_xray: true,
             ..opts
         },
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_pc_windows_msvc.rs b/compiler/rustc_target/src/spec/targets/x86_64_pc_windows_msvc.rs
@@ -7,6 +7,7 @@ pub(crate) fn target() -> Target {
     base.plt_by_default = false;
     base.max_atomic_width = Some(128);
     base.supported_sanitizers = SanitizerSet::ADDRESS;
+    base.stable_sanitizers = SanitizerSet::ADDRESS;
 
     Target {
         llvm_target: "x86_64-pc-windows-msvc".into(),
diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
@@ -12,12 +12,13 @@ pub(crate) fn target() -> Target {
     base.static_position_independent_executables = true;
     base.supported_sanitizers = SanitizerSet::ADDRESS
         | SanitizerSet::CFI
-        | SanitizerSet::KCFI
         | SanitizerSet::DATAFLOW
+        | SanitizerSet::KCFI
         | SanitizerSet::LEAK
         | SanitizerSet::MEMORY
         | SanitizerSet::SAFESTACK
         | SanitizerSet::THREAD;
+    base.stable_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::LEAK;
     base.supports_xray = true;
 
     // When we're asked to use the `rust-lld` linker by default, set the appropriate lld-using
diff --git a/tests/codegen/sanitizer/cfi/external_weak_symbols.rs b/tests/codegen/sanitizer/cfi/external_weak_symbols.rs
@@ -2,7 +2,7 @@
 // emitted correctly.
 //
 //@ needs-sanitizer-cfi
-//@ compile-flags: -Clinker-plugin-lto -Copt-level=0 -Zsanitizer=cfi -Ctarget-feature=-crt-static
+//@ compile-flags: -Clinker-plugin-lto -Copt-level=0 -Zunstable-options -Csanitize=cfi -Ctarget-feature=-crt-static
 #![crate_type = "bin"]
 #![feature(linkage)]
 
diff --git a/tests/codegen/sanitizer/kasan-emits-instrumentation.rs b/tests/codegen/sanitizer/kasan-emits-instrumentation.rs
@@ -1,7 +1,7 @@
 // Verifies that `-Csanitize=kernel-address` emits sanitizer instrumentation.
 
 //@ add-core-stubs
-//@ compile-flags: -Zunstable-options -Zsanitizer=kernel-address -Copt-level=0
+//@ compile-flags: -Zunstable-options -Csanitize=kernel-address -Copt-level=0
 //@ revisions: aarch64 riscv64imac riscv64gc x86_64
 //@[aarch64] compile-flags: --target aarch64-unknown-none
 //@[aarch64] needs-llvm-components: aarch64
diff --git a/tests/codegen/sanitizer/riscv64-shadow-call-stack.rs b/tests/codegen/sanitizer/riscv64-shadow-call-stack.rs
@@ -1,5 +1,5 @@
 //@ add-core-stubs
-//@ compile-flags: --target riscv64imac-unknown-none-elf -Zunstable-options -Zsanitizer=shadow-call-stack
+//@ compile-flags: --target riscv64imac-unknown-none-elf -Zunstable-options -Csanitize=shadow-call-stack
 //@ needs-llvm-components: riscv
 
 #![allow(internal_features)]
diff --git a/tests/ui/asm/global-asm-isnt-really-a-mir-body.rs b/tests/ui/asm/global-asm-isnt-really-a-mir-body.rs
@@ -8,7 +8,7 @@
 //@[instrument] only-linux
 
 // Make sure we don't try to CFI encode it.
-//@[cfi] compile-flags: -Zsanitizer=cfi -Ccodegen-units=1 -Clto -Ctarget-feature=-crt-static -Clink-dead-code=true
+//@[cfi] compile-flags: -Zunstable-options -Csanitize=cfi -Ccodegen-units=1 -Clto -Ctarget-feature=-crt-static -Clink-dead-code=true
 //@[cfi] needs-sanitizer-cfi
 //@[cfi] no-prefer-dynamic
 // FIXME(#122848) Remove only-linux once OSX CFI binaries work
diff --git a/tests/ui/sanitizer/cfi/canonical-jump-tables-requires-cfi.rs b/tests/ui/sanitizer/cfi/canonical-jump-tables-requires-cfi.rs
@@ -7,4 +7,4 @@
 #![no_core]
 #![no_main]
 
-//~? ERROR `-Zsanitizer-cfi-canonical-jump-tables` requires `-Zsanitizer=cfi`
+//~? ERROR `-Zsanitizer-cfi-canonical-jump-tables` requires `-Csanitize=cfi`
diff --git a/tests/ui/sanitizer/cfi/generalize-pointers-requires-cfi.rs b/tests/ui/sanitizer/cfi/generalize-pointers-requires-cfi.rs
@@ -8,4 +8,4 @@
 #![no_core]
 #![no_main]
 
-//~? ERROR `-Zsanitizer-cfi-generalize-pointers` requires `-Zsanitizer=cfi` or `-Zsanitizer=kcfi`
+//~? ERROR `-Zsanitizer-cfi-generalize-pointers` requires `-Csanitize=cfi` or `-Csanitize=kcfi`
diff --git a/tests/ui/sanitizer/cfi/is-incompatible-with-kcfi.rs b/tests/ui/sanitizer/cfi/is-incompatible-with-kcfi.rs
@@ -12,4 +12,4 @@
 #![no_main]
 
 //~? ERROR cfi sanitizer is not supported for this target
-//~? ERROR `-Zsanitizer=cfi` is incompatible with `-Zsanitizer=kcfi`
+//~? ERROR `-Csanitize=cfi` is incompatible with `-Csanitize=kcfi`
diff --git a/tests/ui/sanitizer/cfi/normalize-integers-requires-cfi.rs b/tests/ui/sanitizer/cfi/normalize-integers-requires-cfi.rs
@@ -8,4 +8,4 @@
 #![no_core]
 #![no_main]
 
-//~? ERROR `-Zsanitizer-cfi-normalize-integers` requires `-Zsanitizer=cfi` or `-Zsanitizer=kcfi`
+//~? ERROR `-Zsanitizer-cfi-normalize-integers` requires `-Csanitize=cfi` or `-Csanitize=kcfi`
diff --git a/tests/ui/sanitizer/cfi/requires-lto.rs b/tests/ui/sanitizer/cfi/requires-lto.rs
@@ -7,4 +7,4 @@
 #![no_core]
 #![no_main]
 
-//~? ERROR `-Zsanitizer=cfi` requires `-Clto` or `-Clinker-plugin-lto`
+//~? ERROR `-Csanitize=cfi` requires `-Clto` or `-Clinker-plugin-lto`
diff --git a/tests/ui/sanitizer/cfi/with-rustc-lto-requires-single-codegen-unit.rs b/tests/ui/sanitizer/cfi/with-rustc-lto-requires-single-codegen-unit.rs
@@ -7,4 +7,4 @@
 #![no_core]
 #![no_main]
 
-//~? ERROR `-Zsanitizer=cfi` with `-Clto` requires `-Ccodegen-units=1`
+//~? ERROR `-Csanitize=cfi` with `-Clto` requires `-Ccodegen-units=1`
diff --git a/tests/ui/sanitizer/incompatible.rs b/tests/ui/sanitizer/incompatible.rs
@@ -5,4 +5,4 @@
 #![no_core]
 #![no_main]
 
-//~? ERROR `-Zsanitizer=address` is incompatible with `-Zsanitizer=memory`
+//~? ERROR `-Csanitize=address` is incompatible with `-Csanitize=memory`
diff --git a/tests/ui/sanitizer/kcfi-arity-requires-llvm-21-0-0.rs b/tests/ui/sanitizer/kcfi-arity-requires-llvm-21-0-0.rs
@@ -1,11 +1,12 @@
 // Verifies that `-Zsanitizer-kcfi-arity` requires LLVM 21.0.0 or later.
 //
 //@ needs-sanitizer-kcfi
-//@ compile-flags: -Cno-prepopulate-passes -Ctarget-feature=-crt-static -Cpanic=abort -Zsanitizer=kcfi -Zsanitizer-kcfi-arity
+//@ compile-flags: -Cno-prepopulate-passes -Ctarget-feature=-crt-static -Cpanic=abort -Zunstable-options -Csanitize=kcfi -Zsanitizer-kcfi-arity
 //@ build-fail
 //@ max-llvm-major-version: 20
 
-//~? ERROR `-Zsanitizer-kcfi-arity` requires LLVM 21.0.0 or later.
 #![feature(no_core)]
 #![no_core]
 #![no_main]
+
+//~? ERROR `-Zsanitizer-kcfi-arity` requires LLVM 21.0.0 or later.
diff --git a/tests/ui/sanitizer/stable-and-unstable-supported-can-be-used-with-unstable-options.rs b/tests/ui/sanitizer/stable-and-unstable-supported-can-be-used-with-unstable-options.rs
@@ -0,0 +1,11 @@
+// Verifies that stable and unstable supported sanitizers can be used with `-Zunstable-options`.
+//
+//@ needs-llvm-components: x86
+//@ needs-sanitizer-support
+//@ build-pass
+//@ compile-flags: -Zunstable-options -Clto -Csanitize=address,cfi --target x86_64-unknown-linux-gnu
+
+#![crate_type = "rlib"]
+#![feature(no_core)]
+#![no_core]
+#![no_main]
diff --git a/tests/ui/sanitizer/stable-and-unstable-supported-cannot-be-used-without-unstable-options.rs b/tests/ui/sanitizer/stable-and-unstable-supported-cannot-be-used-without-unstable-options.rs
@@ -0,0 +1,9 @@
+// Verifies that stable and unstable supported sanitizers cannot be used without
+// `-Zunstable-options`.
+//
+//@ needs-llvm-components: x86
+//@ needs-sanitizer-support
+//@ compile-flags: -Clto -Csanitize=address,cfi --target x86_64-unknown-linux-gnu
+//@ error-pattern: error: cfi sanitizer is not supported for this target
+
+fn main() { }
diff --git a/tests/ui/sanitizer/stable-and-unstable-supported-cannot-be-used-without-unstable-options.stderr b/tests/ui/sanitizer/stable-and-unstable-supported-cannot-be-used-without-unstable-options.stderr
@@ -0,0 +1,4 @@
+error: cfi sanitizer is not supported for this target
+
+error: aborting due to 1 previous error
+
diff --git a/tests/ui/sanitizer/stable-supported-can-be-used-with-unstable-options.rs b/tests/ui/sanitizer/stable-supported-can-be-used-with-unstable-options.rs
@@ -0,0 +1,8 @@
+// Verifies that stable supported sanitizers can be used with `-Zunstable-options`.
+//
+//@ needs-llvm-components: x86
+//@ needs-sanitizer-support
+//@ build-pass
+//@ compile-flags: -Zunstable-options -Csanitize=address --target x86_64-unknown-linux-gnu
+
+fn main() { }
diff --git a/tests/ui/sanitizer/stable-supported-can-be-used-without-unstable-options.rs b/tests/ui/sanitizer/stable-supported-can-be-used-without-unstable-options.rs
@@ -0,0 +1,8 @@
+// Verifies that stable supported sanitizers can be used without `-Zunstable-options`.
+//
+//@ needs-llvm-components: x86
+//@ needs-sanitizer-support
+//@ build-pass
+//@ compile-flags: -Csanitize=address --target x86_64-unknown-linux-gnu
+
+fn main() { }
diff --git a/tests/ui/sanitizer/unstable-supported-cannot-be-used-without-unstable-options.rs b/tests/ui/sanitizer/unstable-supported-cannot-be-used-without-unstable-options.rs
@@ -2,8 +2,9 @@
 //
 //@ needs-llvm-components: x86
 //@ compile-flags: -Csanitize=kernel-address --target x86_64-unknown-none
-//@ error-pattern: error: kernel-address sanitizer is not supported for this target
 
 #![feature(no_core)]
 #![no_core]
 #![no_main]
+
+//~? ERROR kernel-address sanitizer is not supported for this target
diff --git a/tests/ui/sanitizer/unsupported-cannot-be-used-with-unstable-options.rs b/tests/ui/sanitizer/unsupported-cannot-be-used-with-unstable-options.rs
@@ -7,3 +7,5 @@
 #![feature(no_core)]
 #![no_core]
 #![no_main]
+
+//~? ERROR kernel-address sanitizer is not supported for this target
diff --git a/tests/ui/sanitizer/unsupported-cannot-be-used-without-unstable-options.rs b/tests/ui/sanitizer/unsupported-cannot-be-used-without-unstable-options.rs
@@ -2,8 +2,9 @@
 //
 //@ needs-llvm-components: x86
 //@ compile-flags: -Csanitize=kernel-address --target x86_64-unknown-linux-gnu
-//@ error-pattern: error: kernel-address sanitizer is not supported for this target
 
 #![feature(no_core)]
 #![no_core]
 #![no_main]
+
+//~? ERROR kernel-address sanitizer is not supported for this target
diff --git a/tests/ui/sanitizer/unsupported-target.rs b/tests/ui/sanitizer/unsupported-target.rs
