Skip to content

Commit f0748b2

Browse files
calebzulawskicalebzulawski
committed
Stabilize target_feature_11
1 parent 6f13ea0 commit f0748b2

33 files changed

+70
-151
lines changed

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+8-19
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,9 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
278278
{
279279
if tcx.sess.target.is_like_wasm || tcx.sess.opts.actually_rustdoc {
280280
// The `#[target_feature]` attribute is allowed on
281-
// WebAssembly targets on all functions, including safe
282-
// ones. Other targets require that `#[target_feature]` is
283-
// only applied to unsafe functions (pending the
284-
// `target_feature_11` feature) because on most targets
281+
// WebAssembly targets on all functions. Prior to stabilizing
282+
// the `target_feature_11` feature, `#[target_feature]` was
283+
// only permitted on safe functions because on most targets
285284
// execution of instructions that are not supported is
286285
// considered undefined behavior. For WebAssembly which is a
287286
// 100% safe target at execution time it's not possible to
@@ -295,17 +294,10 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
295294
// if a target is documenting some wasm-specific code then
296295
// it's not spuriously denied.
297296
//
298-
// This exception needs to be kept in sync with allowing
299-
// `#[target_feature]` on `main` and `start`.
300-
} else if !tcx.features().target_feature_11 {
301-
let mut err = feature_err(
302-
&tcx.sess.parse_sess,
303-
sym::target_feature_11,
304-
attr.span,
305-
"`#[target_feature(..)]` can only be applied to `unsafe` functions",
306-
);
307-
err.span_label(tcx.def_span(did), "not an `unsafe` function");
308-
err.emit();
297+
// Now that `#[target_feature]` is permitted on safe functions,
298+
// this exception must still exist for allowing the attribute on
299+
// `main`, `start`, and other functions that are not usually
300+
// allowed.
309301
} else {
310302
check_target_feature_trait_unsafe(tcx, did, attr.span);
311303
}
@@ -535,10 +527,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
535527
// its parent function, which effectively inherits the features anyway. Boxing this closure
536528
// would result in this closure being compiled without the inherited target features, but this
537529
// is probably a poor usage of `#[inline(always)]` and easily avoided by not using the attribute.
538-
if tcx.features().target_feature_11
539-
&& tcx.is_closure(did.to_def_id())
540-
&& codegen_fn_attrs.inline != InlineAttr::Always
541-
{
530+
if tcx.is_closure(did.to_def_id()) && codegen_fn_attrs.inline != InlineAttr::Always {
542531
let owner_id = tcx.parent(did.to_def_id());
543532
if tcx.def_kind(owner_id).has_codegen_attrs() {
544533
codegen_fn_attrs

‎compiler/rustc_feature/src/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,8 @@ declare_features! (
322322
(accepted, struct_variant, "1.0.0", None, None),
323323
/// Allows `#[target_feature(...)]`.
324324
(accepted, target_feature, "1.27.0", None, None),
325+
/// Allows the use of `#[target_feature]` on safe functions.
326+
(accepted, target_feature_11, "CURRENT_RUSTC_VERSION", Some(69098), None),
325327
/// Allows `fn main()` with return types which implements `Termination` (RFC 1937).
326328
(accepted, termination_trait, "1.26.0", Some(43301), None),
327329
/// Allows `#[test]` functions where the return type implements `Termination` (RFC 1937).

‎compiler/rustc_feature/src/active.rs

-2
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,6 @@ declare_features! (
558558
(active, strict_provenance, "1.61.0", Some(95228), None),
559559
/// Allows string patterns to dereference values to match them.
560560
(active, string_deref_patterns, "1.67.0", Some(87121), None),
561-
/// Allows the use of `#[target_feature]` on safe functions.
562-
(active, target_feature_11, "1.45.0", Some(69098), None),
563561
/// Allows using `#[thread_local]` on `static` items.
564562
(active, thread_local, "1.0.0", Some(29594), None),
565563
/// Allows defining `trait X = A + B;` alias items.

‎library/core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@
246246
#![feature(simd_ffi)]
247247
#![feature(staged_api)]
248248
#![feature(stmt_expr_attributes)]
249-
#![feature(target_feature_11)]
250249
#![feature(trait_alias)]
251250
#![feature(transparent_unions)]
252251
#![feature(try_blocks)]

‎tests/assembly/closure-inherit-target-feature.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// make sure the feature is not enabled at compile-time
44
// compile-flags: -C opt-level=3 -C target-feature=-sse4.1 -C llvm-args=-x86-asm-syntax=intel
55

6-
#![feature(target_feature_11)]
76
#![crate_type = "rlib"]
87

98
use std::arch::x86_64::{__m128, _mm_blend_ps};

‎tests/codegen/target-feature-inline-closure.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// compile-flags: -Copt-level=3
33

44
#![crate_type = "lib"]
5-
#![feature(target_feature_11)]
65

76
#[cfg(target_arch = "x86_64")]
87
use std::arch::x86_64::*;

‎tests/mir-opt/inline/inline_compatibility.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#![crate_type = "lib"]
77
#![feature(no_sanitize)]
8-
#![feature(target_feature_11)]
98
#![feature(c_variadic)]
109

1110
// EMIT_MIR inline_compatibility.inlined_target_feature.Inline.diff

‎tests/ui/asm/x86_64/issue-89875.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// needs-asm-support
33
// only-x86_64
44

5-
#![feature(target_feature_11)]
6-
75
use std::arch::asm;
86

97
#[target_feature(enable = "avx")]

‎tests/ui/lang-items/start_lang_item_with_target_feature.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// only-x86_64
22
// check-fail
33

4-
#![feature(lang_items, no_core, target_feature_11)]
4+
#![feature(lang_items, no_core)]
55
#![no_core]
66

77
#[lang = "copy"]

‎tests/ui/panic-handler/panic-handler-with-target-feature.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// compile-flags:-C panic=abort
22
// only-x86_64
33

4-
#![feature(target_feature_11)]
54
#![no_std]
65
#![no_main]
76

‎tests/ui/panic-handler/panic-handler-with-target-feature.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: `panic_impl` language item function is not allowed to have `#[target_feature]`
2-
--> $DIR/panic-handler-with-target-feature.rs:11:1
2+
--> $DIR/panic-handler-with-target-feature.rs:10:1
33
|
44
LL | #[target_feature(enable = "avx2")]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/rfcs/rfc-2396-target_feature-11/check-pass.rs

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
// revisions: mir thir
1212
// [thir]compile-flags: -Z thir-unsafeck
1313

14-
#![feature(target_feature_11)]
15-
1614
#[target_feature(enable = "sse2")]
1715
const fn sse2() {}
1816

‎tests/ui/rfcs/rfc-2396-target_feature-11/closures-inherit-target_feature.rs

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
// [thir]compile-flags: -Z thir-unsafeck
66
// only-x86_64
77

8-
#![feature(target_feature_11)]
9-
108
#[target_feature(enable="avx")]
119
fn also_use_avx() {
1210
println!("Hello from AVX")

‎tests/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.rs

-6
This file was deleted.

‎tests/ui/rfcs/rfc-2396-target_feature-11/feature-gate-target_feature_11.stderr

-14
This file was deleted.

‎tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.mir.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/fn-ptr.rs:11:21
2+
--> $DIR/fn-ptr.rs:9:21
33
|
44
LL | #[target_feature(enable = "sse2")]
55
| ---------------------------------- `#[target_feature]` added here

‎tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// [thir]compile-flags: -Z thir-unsafeck
33
// only-x86_64
44

5-
#![feature(target_feature_11)]
6-
75
#[target_feature(enable = "sse2")]
86
fn foo() {}
97

‎tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.thir.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/fn-ptr.rs:11:21
2+
--> $DIR/fn-ptr.rs:9:21
33
|
44
LL | #[target_feature(enable = "sse2")]
55
| ---------------------------------- `#[target_feature]` added here

‎tests/ui/rfcs/rfc-2396-target_feature-11/fn-traits.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// only-x86_64
22

3-
#![feature(target_feature_11)]
4-
53
#[target_feature(enable = "avx")]
64
fn foo() {}
75

‎tests/ui/rfcs/rfc-2396-target_feature-11/fn-traits.stderr

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0277]: expected a `Fn<()>` closure, found `fn() {foo}`
2-
--> $DIR/fn-traits.rs:24:10
2+
--> $DIR/fn-traits.rs:22:10
33
|
44
LL | call(foo);
55
| ---- ^^^ expected an `Fn<()>` closure, found `fn() {foo}`
@@ -10,13 +10,13 @@ LL | call(foo);
1010
= note: wrap the `fn() {foo}` in a closure with no arguments: `|| { /* code */ }`
1111
= note: `#[target_feature]` functions do not implement the `Fn` traits
1212
note: required by a bound in `call`
13-
--> $DIR/fn-traits.rs:11:17
13+
--> $DIR/fn-traits.rs:9:17
1414
|
1515
LL | fn call(f: impl Fn()) {
1616
| ^^^^ required by this bound in `call`
1717

1818
error[E0277]: expected a `FnMut<()>` closure, found `fn() {foo}`
19-
--> $DIR/fn-traits.rs:25:14
19+
--> $DIR/fn-traits.rs:23:14
2020
|
2121
LL | call_mut(foo);
2222
| -------- ^^^ expected an `FnMut<()>` closure, found `fn() {foo}`
@@ -27,13 +27,13 @@ LL | call_mut(foo);
2727
= note: wrap the `fn() {foo}` in a closure with no arguments: `|| { /* code */ }`
2828
= note: `#[target_feature]` functions do not implement the `Fn` traits
2929
note: required by a bound in `call_mut`
30-
--> $DIR/fn-traits.rs:15:21
30+
--> $DIR/fn-traits.rs:13:21
3131
|
3232
LL | fn call_mut(f: impl FnMut()) {
3333
| ^^^^^^^ required by this bound in `call_mut`
3434

3535
error[E0277]: expected a `FnOnce<()>` closure, found `fn() {foo}`
36-
--> $DIR/fn-traits.rs:26:15
36+
--> $DIR/fn-traits.rs:24:15
3737
|
3838
LL | call_once(foo);
3939
| --------- ^^^ expected an `FnOnce<()>` closure, found `fn() {foo}`
@@ -44,13 +44,13 @@ LL | call_once(foo);
4444
= note: wrap the `fn() {foo}` in a closure with no arguments: `|| { /* code */ }`
4545
= note: `#[target_feature]` functions do not implement the `Fn` traits
4646
note: required by a bound in `call_once`
47-
--> $DIR/fn-traits.rs:19:22
47+
--> $DIR/fn-traits.rs:17:22
4848
|
4949
LL | fn call_once(f: impl FnOnce()) {
5050
| ^^^^^^^^ required by this bound in `call_once`
5151

5252
error[E0277]: expected a `Fn<()>` closure, found `unsafe fn() {foo_unsafe}`
53-
--> $DIR/fn-traits.rs:28:10
53+
--> $DIR/fn-traits.rs:26:10
5454
|
5555
LL | call(foo_unsafe);
5656
| ---- ^^^^^^^^^^ call the function in a closure: `|| unsafe { /* code */ }`
@@ -61,13 +61,13 @@ LL | call(foo_unsafe);
6161
= note: wrap the `unsafe fn() {foo_unsafe}` in a closure with no arguments: `|| { /* code */ }`
6262
= note: `#[target_feature]` functions do not implement the `Fn` traits
6363
note: required by a bound in `call`
64-
--> $DIR/fn-traits.rs:11:17
64+
--> $DIR/fn-traits.rs:9:17
6565
|
6666
LL | fn call(f: impl Fn()) {
6767
| ^^^^ required by this bound in `call`
6868

6969
error[E0277]: expected a `FnMut<()>` closure, found `unsafe fn() {foo_unsafe}`
70-
--> $DIR/fn-traits.rs:30:14
70+
--> $DIR/fn-traits.rs:28:14
7171
|
7272
LL | call_mut(foo_unsafe);
7373
| -------- ^^^^^^^^^^ call the function in a closure: `|| unsafe { /* code */ }`
@@ -78,13 +78,13 @@ LL | call_mut(foo_unsafe);
7878
= note: wrap the `unsafe fn() {foo_unsafe}` in a closure with no arguments: `|| { /* code */ }`
7979
= note: `#[target_feature]` functions do not implement the `Fn` traits
8080
note: required by a bound in `call_mut`
81-
--> $DIR/fn-traits.rs:15:21
81+
--> $DIR/fn-traits.rs:13:21
8282
|
8383
LL | fn call_mut(f: impl FnMut()) {
8484
| ^^^^^^^ required by this bound in `call_mut`
8585

8686
error[E0277]: expected a `FnOnce<()>` closure, found `unsafe fn() {foo_unsafe}`
87-
--> $DIR/fn-traits.rs:32:15
87+
--> $DIR/fn-traits.rs:30:15
8888
|
8989
LL | call_once(foo_unsafe);
9090
| --------- ^^^^^^^^^^ call the function in a closure: `|| unsafe { /* code */ }`
@@ -95,7 +95,7 @@ LL | call_once(foo_unsafe);
9595
= note: wrap the `unsafe fn() {foo_unsafe}` in a closure with no arguments: `|| { /* code */ }`
9696
= note: `#[target_feature]` functions do not implement the `Fn` traits
9797
note: required by a bound in `call_once`
98-
--> $DIR/fn-traits.rs:19:22
98+
--> $DIR/fn-traits.rs:17:22
9999
|
100100
LL | fn call_once(f: impl FnOnce()) {
101101
| ^^^^^^^^ required by this bound in `call_once`

‎tests/ui/rfcs/rfc-2396-target_feature-11/issue-108645-target-feature-on-main.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// only-x86_64
22

3-
#![feature(target_feature_11)]
4-
53
#[target_feature(enable = "avx2")]
64
fn main() {}
75
//~^ ERROR `main` function is not allowed to have `#[target_feature]`

‎tests/ui/rfcs/rfc-2396-target_feature-11/issue-108645-target-feature-on-main.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: `main` function is not allowed to have `#[target_feature]`
2-
--> $DIR/issue-108645-target-feature-on-main.rs:6:1
2+
--> $DIR/issue-108645-target-feature-on-main.rs:4:1
33
|
44
LL | fn main() {}
55
| ^^^^^^^^^ `main` function is not allowed to have `#[target_feature]`

‎tests/ui/rfcs/rfc-2396-target_feature-11/issue-108645-target-feature-on-start.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// only-x86_64
22

33
#![feature(start)]
4-
#![feature(target_feature_11)]
54

65
#[start]
76
#[target_feature(enable = "avx2")]

‎tests/ui/rfcs/rfc-2396-target_feature-11/issue-108645-target-feature-on-start.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: `#[start]` function is not allowed to have `#[target_feature]`
2-
--> $DIR/issue-108645-target-feature-on-start.rs:7:1
2+
--> $DIR/issue-108645-target-feature-on-start.rs:6:1
33
|
44
LL | #[target_feature(enable = "avx2")]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/rfcs/rfc-2396-target_feature-11/issue-108655-inline-always-closure.rs

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
// [thir]compile-flags: -Z thir-unsafeck
66
// only-x86_64
77

8-
#![feature(target_feature_11)]
9-
108
#[target_feature(enable = "avx")]
119
pub unsafe fn test() {
1210
({

‎tests/ui/rfcs/rfc-2396-target_feature-11/issue-99876.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// check-pass
22

3-
#![feature(target_feature_11)]
4-
53
struct S<T>(T)
64
where
75
[T; (|| {}, 1).1]: Copy;

0 commit comments

Comments
 (0)