Skip to content

Commit 668ab73

Browse files
calebzulawskiveluca93
calebzulawski
authored and
veluca93
committed
Stabilize target_feature_11
1 parent f4f0faf commit 668ab73

38 files changed

+260
-159
lines changed

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+8-19
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,9 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
255255
{
256256
if tcx.sess.target.is_like_wasm || tcx.sess.opts.actually_rustdoc {
257257
// The `#[target_feature]` attribute is allowed on
258-
// WebAssembly targets on all functions, including safe
259-
// ones. Other targets require that `#[target_feature]` is
260-
// only applied to unsafe functions (pending the
261-
// `target_feature_11` feature) because on most targets
258+
// WebAssembly targets on all functions. Prior to stabilizing
259+
// the `target_feature_11` feature, `#[target_feature]` was
260+
// only permitted on safe functions because on most targets
262261
// execution of instructions that are not supported is
263262
// considered undefined behavior. For WebAssembly which is a
264263
// 100% safe target at execution time it's not possible to
@@ -272,17 +271,10 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
272271
// if a target is documenting some wasm-specific code then
273272
// it's not spuriously denied.
274273
//
275-
// This exception needs to be kept in sync with allowing
276-
// `#[target_feature]` on `main` and `start`.
277-
} else if !tcx.features().target_feature_11() {
278-
feature_err(
279-
&tcx.sess,
280-
sym::target_feature_11,
281-
attr.span,
282-
"`#[target_feature(..)]` can only be applied to `unsafe` functions",
283-
)
284-
.with_span_label(tcx.def_span(did), "not an `unsafe` function")
285-
.emit();
274+
// Now that `#[target_feature]` is permitted on safe functions,
275+
// this exception must still exist for allowing the attribute on
276+
// `main`, `start`, and other functions that are not usually
277+
// allowed.
286278
} else {
287279
check_target_feature_trait_unsafe(tcx, did, attr.span);
288280
}
@@ -599,10 +591,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
599591
// its parent function, which effectively inherits the features anyway. Boxing this closure
600592
// would result in this closure being compiled without the inherited target features, but this
601593
// is probably a poor usage of `#[inline(always)]` and easily avoided by not using the attribute.
602-
if tcx.features().target_feature_11()
603-
&& tcx.is_closure_like(did.to_def_id())
604-
&& codegen_fn_attrs.inline != InlineAttr::Always
605-
{
594+
if tcx.is_closure_like(did.to_def_id()) && codegen_fn_attrs.inline != InlineAttr::Always {
606595
let owner_id = tcx.parent(did.to_def_id());
607596
if tcx.def_kind(owner_id).has_codegen_attrs() {
608597
codegen_fn_attrs

‎compiler/rustc_feature/src/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ declare_features! (
387387
(accepted, struct_variant, "1.0.0", None),
388388
/// Allows `#[target_feature(...)]`.
389389
(accepted, target_feature, "1.27.0", None),
390+
/// Allows the use of `#[target_feature]` on safe functions.
391+
(accepted, target_feature_11, "CURRENT_RUSTC_VERSION", Some(69098)),
390392
/// Allows `fn main()` with return types which implements `Termination` (RFC 1937).
391393
(accepted, termination_trait, "1.26.0", Some(43301)),
392394
/// Allows `#[test]` functions where the return type implements `Termination` (RFC 1937).

‎compiler/rustc_feature/src/unstable.rs

-2
Original file line numberDiff line numberDiff line change
@@ -613,8 +613,6 @@ declare_features! (
613613
(unstable, strict_provenance_lints, "1.61.0", Some(130351)),
614614
/// Allows string patterns to dereference values to match them.
615615
(unstable, string_deref_patterns, "1.67.0", Some(87121)),
616-
/// Allows the use of `#[target_feature]` on safe functions.
617-
(unstable, target_feature_11, "1.45.0", Some(69098)),
618616
/// Allows using `#[thread_local]` on `static` items.
619617
(unstable, thread_local, "1.0.0", Some(29594)),
620618
/// Allows defining `trait X = A + B;` alias items.

‎library/core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@
187187
#![feature(staged_api)]
188188
#![feature(stmt_expr_attributes)]
189189
#![feature(strict_provenance_lints)]
190-
#![feature(target_feature_11)]
191190
#![feature(trait_alias)]
192191
#![feature(transparent_unions)]
193192
#![feature(try_blocks)]

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

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

7-
#![feature(target_feature_11)]
87
#![crate_type = "rlib"]
98

109
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
@@ -3,7 +3,6 @@
33
//@ compile-flags: -Copt-level=3 -Ctarget-cpu=x86-64
44

55
#![crate_type = "lib"]
6-
#![feature(target_feature_11)]
76

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

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

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#![crate_type = "lib"]
66
#![feature(no_sanitize)]
7-
#![feature(target_feature_11)]
87
#![feature(c_variadic)]
98

109
#[inline]

‎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/async-await/async-closures/fn-exception-target-features.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
//@ edition: 2021
22
//@ only-x86_64
33

4-
#![feature(target_feature_11)]
5-
// `target_feature_11` just to test safe functions w/ target features.
6-
7-
use std::pin::Pin;
84
use std::future::Future;
5+
use std::pin::Pin;
96

107
#[target_feature(enable = "sse2")]
11-
fn target_feature() -> Pin<Box<dyn Future<Output = ()> + 'static>> { todo!() }
8+
fn target_feature() -> Pin<Box<dyn Future<Output = ()> + 'static>> {
9+
todo!()
10+
}
1211

1312
fn test(f: impl AsyncFn()) {}
1413

‎tests/ui/async-await/async-closures/fn-exception-target-features.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0277]: the trait bound `fn() -> Pin<Box<(dyn Future<Output = ()> + 'static)>> {target_feature}: AsyncFn()` is not satisfied
2-
--> $DIR/fn-exception-target-features.rs:16:10
2+
--> $DIR/fn-exception-target-features.rs:15:10
33
|
44
LL | test(target_feature);
55
| ---- ^^^^^^^^^^^^^^ the trait `AsyncFn()` is not implemented for fn item `fn() -> Pin<Box<(dyn Future<Output = ()> + 'static)>> {target_feature}`
66
| |
77
| required by a bound introduced by this call
88
|
99
note: required by a bound in `test`
10-
--> $DIR/fn-exception-target-features.rs:13:17
10+
--> $DIR/fn-exception-target-features.rs:12:17
1111
|
1212
LL | fn test(f: impl AsyncFn()) {}
1313
| ^^^^^^^^^ required by this bound in `test`

‎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_handler]` 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
@@ -9,8 +9,6 @@
99
//@ check-pass
1010
//@ only-x86_64
1111

12-
#![feature(target_feature_11)]
13-
1412
#[target_feature(enable = "sse2")]
1513
const fn sse2() {}
1614

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

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
//@ check-pass
44
//@ only-x86_64
55

6-
#![feature(target_feature_11)]
7-
86
#[target_feature(enable = "avx")]
97
fn also_use_avx() {
108
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

-15
This file was deleted.

‎tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.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 = "sse2")]
64
fn foo() {}
75

‎tests/ui/rfcs/rfc-2396-target_feature-11/fn-ptr.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:9:21
2+
--> $DIR/fn-ptr.rs:7:21
33
|
44
LL | #[target_feature(enable = "sse2")]
55
| ---------------------------------- `#[target_feature]` added here

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

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
error[E0308]: mismatched types
2+
--> $DIR/fn-ptr.rs:9:21
3+
|
4+
LL | #[target_feature(enable = "sse2")]
5+
| ---------------------------------- `#[target_feature]` added here
6+
...
7+
LL | let foo: fn() = foo;
8+
| ---- ^^^ cannot coerce functions with `#[target_feature]` to safe function pointers
9+
| |
10+
| expected due to this
11+
|
12+
= note: expected fn pointer `fn()`
13+
found fn item `fn() {foo}`
14+
= note: fn items are distinct from fn pointers
15+
= note: functions with `#[target_feature]` can only be coerced to `unsafe` function pointers
16+
help: consider casting to a fn pointer
17+
|
18+
LL | let foo: fn() = foo as fn();
19+
| ~~~~~~~~~~~
20+
21+
error: aborting due to previous error
22+
23+
For more information about this error, try `rustc --explain E0308`.

‎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:25
30+
--> $DIR/fn-traits.rs:13:25
3131
|
3232
LL | fn call_mut(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 */ }`
@@ -62,13 +62,13 @@ LL | call(foo_unsafe);
6262
= note: wrap the `unsafe fn() {foo_unsafe}` in a closure with no arguments: `|| { /* code */ }`
6363
= note: `#[target_feature]` functions do not implement the `Fn` traits
6464
note: required by a bound in `call`
65-
--> $DIR/fn-traits.rs:11:17
65+
--> $DIR/fn-traits.rs:9:17
6666
|
6767
LL | fn call(f: impl Fn()) {
6868
| ^^^^ required by this bound in `call`
6969

7070
error[E0277]: expected a `FnMut()` closure, found `unsafe fn() {foo_unsafe}`
71-
--> $DIR/fn-traits.rs:30:14
71+
--> $DIR/fn-traits.rs:28:14
7272
|
7373
LL | call_mut(foo_unsafe);
7474
| -------- ^^^^^^^^^^ call the function in a closure: `|| unsafe { /* code */ }`
@@ -80,13 +80,13 @@ LL | call_mut(foo_unsafe);
8080
= note: wrap the `unsafe fn() {foo_unsafe}` in a closure with no arguments: `|| { /* code */ }`
8181
= note: `#[target_feature]` functions do not implement the `Fn` traits
8282
note: required by a bound in `call_mut`
83-
--> $DIR/fn-traits.rs:15:25
83+
--> $DIR/fn-traits.rs:13:25
8484
|
8585
LL | fn call_mut(mut f: impl FnMut()) {
8686
| ^^^^^^^ required by this bound in `call_mut`
8787

8888
error[E0277]: expected a `FnOnce()` closure, found `unsafe fn() {foo_unsafe}`
89-
--> $DIR/fn-traits.rs:32:15
89+
--> $DIR/fn-traits.rs:30:15
9090
|
9191
LL | call_once(foo_unsafe);
9292
| --------- ^^^^^^^^^^ call the function in a closure: `|| unsafe { /* code */ }`
@@ -98,7 +98,7 @@ LL | call_once(foo_unsafe);
9898
= note: wrap the `unsafe fn() {foo_unsafe}` in a closure with no arguments: `|| { /* code */ }`
9999
= note: `#[target_feature]` functions do not implement the `Fn` traits
100100
note: required by a bound in `call_once`
101-
--> $DIR/fn-traits.rs:19:22
101+
--> $DIR/fn-traits.rs:17:22
102102
|
103103
LL | fn call_once(f: impl FnOnce()) {
104104
| ^^^^^^^^ 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
@@ -3,8 +3,6 @@
33
//@ check-pass
44
//@ only-x86_64
55

6-
#![feature(target_feature_11)]
7-
86
#[target_feature(enable = "avx")]
97
pub unsafe fn test() {
108
({

‎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)