sanitizers: Stabilize the no_sanitize attribute

rcvalle · rcvalle · commit e02fab2f0eb7 · 2024-12-20T05:07:10.000Z
Stabilize the `no_sanitize` attribute so stable sanitizers can also be
selectively disabled for annotated functions.
diff --git a/compiler/rustc_feature/src/accepted.rs b/compiler/rustc_feature/src/accepted.rs
@@ -312,6 +312,8 @@ declare_features! (
     (accepted, native_link_modifiers_whole_archive, "1.61.0", Some(81490)),
     /// Allows using non lexical lifetimes (RFC 2094).
     (accepted, nll, "1.63.0", Some(43234)),
+    /// Allows the use of `no_sanitize` attribute.
+    (accepted, no_sanitize, "CURRENT_RUSTC_VERSION", Some(39699)),
     /// Allows using `#![no_std]`.
     (accepted, no_std, "1.6.0", None),
     /// Allows defining identifiers beyond ASCII.
diff --git a/compiler/rustc_feature/src/builtin_attrs.rs b/compiler/rustc_feature/src/builtin_attrs.rs
@@ -475,10 +475,10 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
     ),
     ungated!(track_caller, Normal, template!(Word), WarnFollowing, EncodeCrossCrate::Yes),
     ungated!(instruction_set, Normal, template!(List: "set"), ErrorPreceding, EncodeCrossCrate::No),
-    gated!(
+    ungated!(
         no_sanitize, Normal,
         template!(List: "address, kcfi, memory, thread"), DuplicatesOk,
-        EncodeCrossCrate::No, experimental!(no_sanitize)
+        EncodeCrossCrate::No
     ),
     ungated!(
         coverage, Normal, template!(OneOf: &[sym::off, sym::on]),
diff --git a/compiler/rustc_feature/src/unstable.rs b/compiler/rustc_feature/src/unstable.rs
@@ -563,8 +563,6 @@ declare_features! (
     (unstable, never_type_fallback, "1.41.0", Some(65992)),
     /// Allows `#![no_core]`.
     (unstable, no_core, "1.3.0", Some(29639)),
-    /// Allows the use of `no_sanitize` attribute.
-    (unstable, no_sanitize, "1.42.0", Some(39699)),
     /// Allows using the `non_exhaustive_omitted_patterns` lint.
     (unstable, non_exhaustive_omitted_patterns_lint, "1.57.0", Some(89554)),
     /// Allows `for<T>` binders in where-clauses
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
@@ -2440,8 +2440,6 @@ declare_lint! {
     /// ### Example
     ///
     /// ```rust
-    /// #![feature(no_sanitize)]
-    ///
     /// #[inline(always)]
     /// #[no_sanitize(address)]
     /// fn x() {}
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs
@@ -138,6 +138,9 @@
 #![feature(variant_count)]
 // tidy-alphabetical-end
 //
+// Features:
+#![cfg_attr(bootstrap, feature(no_sanitize))]
+//
 // Language features:
 // tidy-alphabetical-start
 #![feature(abi_unadjusted)]
@@ -176,7 +179,6 @@
 #![feature(negative_impls)]
 #![feature(never_type)]
 #![feature(no_core)]
-#![feature(no_sanitize)]
 #![feature(optimize_attribute)]
 #![feature(prelude_import)]
 #![feature(repr_simd)]
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
@@ -261,6 +261,7 @@
 #![allow(unused_features)]
 //
 // Features:
+#![cfg_attr(bootstrap, feature(no_sanitize))]
 #![cfg_attr(test, feature(internal_output_capture, print_internals, update_panic_count, rt))]
 #![cfg_attr(
     all(target_vendor = "fortanix", target_env = "sgx"),
@@ -304,7 +305,6 @@
 #![feature(needs_panic_runtime)]
 #![feature(negative_impls)]
 #![feature(never_type)]
-#![feature(no_sanitize)]
 #![feature(optimize_attribute)]
 #![feature(prelude_import)]
 #![feature(rustc_attrs)]
diff --git a/src/doc/unstable-book/src/language-features/no-sanitize.md b/src/doc/unstable-book/src/language-features/no-sanitize.md
diff --git a/tests/codegen/sanitizer/cfi/emit-type-checks-attr-no-sanitize.rs b/tests/codegen/sanitizer/cfi/emit-type-checks-attr-no-sanitize.rs
@@ -4,7 +4,6 @@
 //@ compile-flags: -Clto -Cno-prepopulate-passes -Ctarget-feature=-crt-static -Zunstable-options -Csanitize=cfi -Copt-level=0
 
 #![crate_type = "lib"]
-#![feature(no_sanitize)]
 
 #[no_sanitize(cfi)]
 pub fn foo(f: fn(i32) -> i32, arg: i32) -> i32 {
diff --git a/tests/codegen/sanitizer/no-sanitize-inlining.rs b/tests/codegen/sanitizer/no-sanitize-inlining.rs
@@ -9,8 +9,6 @@
 //@[LSAN] compile-flags: -Zunstable-options -Csanitize=leak
 
 #![crate_type = "lib"]
-#![feature(no_sanitize)]
-
 // ASAN-LABEL: define void @test
 // ASAN:         call {{.*}} @random_inline
 // ASAN:       }
diff --git a/tests/codegen/sanitizer/scs-attr-check.rs b/tests/codegen/sanitizer/scs-attr-check.rs
@@ -5,8 +5,6 @@
 //@ compile-flags: -Zunstable-options -Csanitize=shadow-call-stack
 
 #![crate_type = "lib"]
-#![feature(no_sanitize)]
-
 // CHECK: ; sanitizer_scs_attr_check::scs
 // CHECK-NEXT: ; Function Attrs:{{.*}}shadowcallstack
 pub fn scs() {}
diff --git a/tests/mir-opt/inline/inline_compatibility.rs b/tests/mir-opt/inline/inline_compatibility.rs
@@ -3,7 +3,6 @@
 //@ compile-flags: -Cpanic=abort
 
 #![crate_type = "lib"]
-#![feature(no_sanitize)]
 #![feature(target_feature_11)]
 #![feature(c_variadic)]
 
diff --git a/tests/ui/attributes/no-sanitize.rs b/tests/ui/attributes/no-sanitize.rs
@@ -1,4 +1,3 @@
-#![feature(no_sanitize)]
 #![feature(stmt_expr_attributes)]
 #![deny(unused_attributes)]
 #![allow(dead_code)]
diff --git a/tests/ui/attributes/no-sanitize.stderr b/tests/ui/attributes/no-sanitize.stderr
@@ -1,5 +1,5 @@
 error: `#[no_sanitize(memory)]` should be applied to a function
-  --> $DIR/no-sanitize.rs:7:19
+  --> $DIR/no-sanitize.rs:6:19
    |
 LL |       #[no_sanitize(memory)]
    |                     ^^^^^^
@@ -9,39 +9,39 @@ LL | |     };
    | |_____- not a function
 
 error: `#[no_sanitize(memory)]` should be applied to a function
-  --> $DIR/no-sanitize.rs:13:15
+  --> $DIR/no-sanitize.rs:12:15
    |
 LL | #[no_sanitize(memory)]
    |               ^^^^^^
 LL | type InvalidTy = ();
    | -------------------- not a function
 
 error: `#[no_sanitize(memory)]` should be applied to a function
-  --> $DIR/no-sanitize.rs:16:15
+  --> $DIR/no-sanitize.rs:15:15
    |
 LL | #[no_sanitize(memory)]
    |               ^^^^^^
 LL | mod invalid_module {}
    | --------------------- not a function
 
 error: `#[no_sanitize(memory)]` should be applied to a function
-  --> $DIR/no-sanitize.rs:20:27
+  --> $DIR/no-sanitize.rs:19:27
    |
 LL |     let _ = #[no_sanitize(memory)]
    |                           ^^^^^^
 LL |     (|| 1);
    |     ------ not a function
 
 error: `#[no_sanitize(memory)]` should be applied to a function
-  --> $DIR/no-sanitize.rs:24:15
+  --> $DIR/no-sanitize.rs:23:15
    |
 LL | #[no_sanitize(memory)]
    |               ^^^^^^
 LL | struct F;
    | --------- not a function
 
 error: `#[no_sanitize(memory)]` should be applied to a function
-  --> $DIR/no-sanitize.rs:27:15
+  --> $DIR/no-sanitize.rs:26:15
    |
 LL |   #[no_sanitize(memory)]
    |                 ^^^^^^
@@ -52,7 +52,7 @@ LL | | }
    | |_- not a function
 
 error: `#[no_sanitize(memory)]` should be applied to a function
-  --> $DIR/no-sanitize.rs:33:24
+  --> $DIR/no-sanitize.rs:32:24
    |
 LL | #[no_sanitize(address, memory)]
    |                        ^^^^^^
diff --git a/tests/ui/feature-gates/feature-gate-no_sanitize.rs b/tests/ui/feature-gates/feature-gate-no_sanitize.rs
diff --git a/tests/ui/feature-gates/feature-gate-no_sanitize.stderr b/tests/ui/feature-gates/feature-gate-no_sanitize.stderr
diff --git a/tests/ui/invalid/invalid-no-sanitize.rs b/tests/ui/invalid/invalid-no-sanitize.rs
@@ -1,5 +1,3 @@
-#![feature(no_sanitize)]
-
 #[no_sanitize(brontosaurus)] //~ ERROR invalid argument
 fn main() {
 }
diff --git a/tests/ui/invalid/invalid-no-sanitize.stderr b/tests/ui/invalid/invalid-no-sanitize.stderr
@@ -1,5 +1,5 @@
 error: invalid argument for `no_sanitize`
-  --> $DIR/invalid-no-sanitize.rs:3:15
+  --> $DIR/invalid-no-sanitize.rs:1:15
    |
 LL | #[no_sanitize(brontosaurus)]
    |               ^^^^^^^^^^^^
diff --git a/tests/ui/sanitizer/inline-always.rs b/tests/ui/sanitizer/inline-always.rs
@@ -1,7 +1,5 @@
 //@ check-pass
 
-#![feature(no_sanitize)]
-
 #[inline(always)]
 //~^ NOTE inlining requested here
 #[no_sanitize(address)]
diff --git a/tests/ui/sanitizer/inline-always.stderr b/tests/ui/sanitizer/inline-always.stderr
@@ -1,11 +1,11 @@
 warning: `no_sanitize` will have no effect after inlining
-  --> $DIR/inline-always.rs:7:1
+  --> $DIR/inline-always.rs:5:1
    |
 LL | #[no_sanitize(address)]
    | ^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: inlining requested here
-  --> $DIR/inline-always.rs:5:1
+  --> $DIR/inline-always.rs:3:1
    |
 LL | #[inline(always)]
    | ^^^^^^^^^^^^^^^^^
