Skip to content

Commit b379d21

Browse files
LeSeulArtichautLeSeulArtichaut
committed
Stabilize #![feature(target_feature_11)] 
1 parent 0d32c8f commit b379d21

28 files changed

+78
-151
lines changed

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+18-29
Original file line numberDiff line numberDiff line change
@@ -268,34 +268,23 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: DefId) -> CodegenFnAttrs {
268268
if !tcx.is_closure(did.to_def_id())
269269
&& tcx.fn_sig(did).skip_binder().unsafety() == hir::Unsafety::Normal
270270
{
271-
if tcx.sess.target.is_like_wasm || tcx.sess.opts.actually_rustdoc {
272-
// The `#[target_feature]` attribute is allowed on
273-
// WebAssembly targets on all functions, including safe
274-
// ones. Other targets require that `#[target_feature]` is
275-
// only applied to unsafe functions (pending the
276-
// `target_feature_11` feature) because on most targets
277-
// execution of instructions that are not supported is
278-
// considered undefined behavior. For WebAssembly which is a
279-
// 100% safe target at execution time it's not possible to
280-
// execute undefined instructions, and even if a future
281-
// feature was added in some form for this it would be a
282-
// deterministic trap. There is no undefined behavior when
283-
// executing WebAssembly so `#[target_feature]` is allowed
284-
// on safe functions (but again, only for WebAssembly)
285-
//
286-
// Note that this is also allowed if `actually_rustdoc` so
287-
// if a target is documenting some wasm-specific code then
288-
// it's not spuriously denied.
289-
} else if !tcx.features().target_feature_11 {
290-
let mut err = feature_err(
291-
&tcx.sess.parse_sess,
292-
sym::target_feature_11,
293-
attr.span,
294-
"`#[target_feature(..)]` can only be applied to `unsafe` functions",
295-
);
296-
err.span_label(tcx.def_span(did), "not an `unsafe` function");
297-
err.emit();
298-
} else {
271+
// The `#[target_feature]` attribute is allowed on
272+
// WebAssembly targets on all functions, including safe
273+
// ones. Other targets have conditions on the usage of
274+
// `#[target_feature]` because on most targets
275+
// execution of instructions that are not supported is
276+
// considered undefined behavior. For WebAssembly which is a
277+
// 100% safe target at execution time it's not possible to
278+
// execute undefined instructions, and even if a future
279+
// feature was added in some form for this it would be a
280+
// deterministic trap. There is no undefined behavior when
281+
// executing WebAssembly so `#[target_feature]` is allowed
282+
// on safe functions (but again, only for WebAssembly)
283+
//
284+
// Note that this is also allowed if `actually_rustdoc` so
285+
// if a target is documenting some wasm-specific code then
286+
// it's not spuriously denied.
287+
if !(tcx.sess.target.is_like_wasm || tcx.sess.opts.actually_rustdoc) {
299288
check_target_feature_trait_unsafe(tcx, did, attr.span);
300289
}
301290
}
@@ -533,7 +522,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: DefId) -> CodegenFnAttrs {
533522
});
534523

535524
// #73631: closures inherit `#[target_feature]` annotations
536-
if tcx.features().target_feature_11 && tcx.is_closure(did.to_def_id()) {
525+
if tcx.is_closure(did.to_def_id()) {
537526
let owner_id = tcx.parent(did.to_def_id());
538527
if tcx.def_kind(owner_id).has_codegen_attrs() {
539528
codegen_fn_attrs

‎compiler/rustc_feature/src/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,8 @@ declare_features! (
312312
(accepted, struct_variant, "1.0.0", None, None),
313313
/// Allows `#[target_feature(...)]`.
314314
(accepted, target_feature, "1.27.0", None, None),
315+
/// Allows the use of `#[target_feature]` on safe functions.
316+
(accepted, target_feature_11, "CURRENT_RUSTC_VERSION", Some(69098), None),
315317
/// Allows `fn main()` with return types which implements `Termination` (RFC 1937).
316318
(accepted, termination_trait, "1.26.0", Some(43301), None),
317319
/// 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
@@ -509,8 +509,6 @@ declare_features! (
509509
(active, strict_provenance, "1.61.0", Some(95228), None),
510510
/// Allows string patterns to dereference values to match them.
511511
(active, string_deref_patterns, "1.67.0", Some(87121), None),
512-
/// Allows the use of `#[target_feature]` on safe functions.
513-
(active, target_feature_11, "1.45.0", Some(69098), None),
514512
/// Allows using `#[thread_local]` on `static` items.
515513
(active, thread_local, "1.0.0", Some(29594), None),
516514
/// Allows defining `trait X = A + B;` alias items.

‎library/core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@
228228
#![feature(simd_ffi)]
229229
#![feature(staged_api)]
230230
#![feature(stmt_expr_attributes)]
231-
#![feature(target_feature_11)]
232231
#![feature(trait_alias)]
233232
#![feature(transparent_unions)]
234233
#![feature(try_blocks)]

‎tests/mir-opt/inline/inline_compatibility.inlined_no_sanitize.Inline.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
fn inlined_no_sanitize() -> () {
55
let mut _0: (); // return place in scope 0 at $DIR/inline_compatibility.rs:+0:37: +0:37
66
let _1: (); // in scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:18
7-
+ scope 1 (inlined no_sanitize) { // at $DIR/inline_compatibility.rs:24:5: 24:18
7+
+ scope 1 (inlined no_sanitize) { // at $DIR/inline_compatibility.rs:23:5: 23:18
88
+ }
99

1010
bb0: {
1111
StorageLive(_1); // scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:18
1212
- _1 = no_sanitize() -> bb1; // scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:18
1313
- // mir::Constant
14-
- // + span: $DIR/inline_compatibility.rs:24:5: 24:16
14+
- // + span: $DIR/inline_compatibility.rs:23:5: 23:16
1515
- // + literal: Const { ty: unsafe fn() {no_sanitize}, val: Value(<ZST>) }
1616
- }
1717
-

‎tests/mir-opt/inline/inline_compatibility.inlined_target_feature.Inline.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
fn inlined_target_feature() -> () {
55
let mut _0: (); // return place in scope 0 at $DIR/inline_compatibility.rs:+0:40: +0:40
66
let _1: (); // in scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:21
7-
+ scope 1 (inlined target_feature) { // at $DIR/inline_compatibility.rs:13:5: 13:21
7+
+ scope 1 (inlined target_feature) { // at $DIR/inline_compatibility.rs:12:5: 12:21
88
+ }
99

1010
bb0: {
1111
StorageLive(_1); // scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:21
1212
- _1 = target_feature() -> bb1; // scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:21
1313
- // mir::Constant
14-
- // + span: $DIR/inline_compatibility.rs:13:5: 13:19
14+
- // + span: $DIR/inline_compatibility.rs:12:5: 12:19
1515
- // + literal: Const { ty: unsafe fn() {target_feature}, val: Value(<ZST>) }
1616
- }
1717
-

‎tests/mir-opt/inline/inline_compatibility.not_inlined_c_variadic.Inline.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
StorageLive(_1); // scope 0 at $DIR/inline_compatibility.rs:+1:9: +1:10
1313
_1 = sum(const 4_u32, const 4_u32, const 30_u32, const 200_u32, const 1000_u32) -> bb1; // scope 0 at $DIR/inline_compatibility.rs:+1:13: +1:52
1414
// mir::Constant
15-
// + span: $DIR/inline_compatibility.rs:42:13: 42:16
15+
// + span: $DIR/inline_compatibility.rs:41:13: 41:16
1616
// + literal: Const { ty: unsafe extern "C" fn(u32, ...) -> u32 {sum}, val: Value(<ZST>) }
1717
}
1818

‎tests/mir-opt/inline/inline_compatibility.not_inlined_no_sanitize.Inline.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
StorageLive(_1); // scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:18
1010
_1 = no_sanitize() -> bb1; // scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:18
1111
// mir::Constant
12-
// + span: $DIR/inline_compatibility.rs:29:5: 29:16
12+
// + span: $DIR/inline_compatibility.rs:28:5: 28:16
1313
// + literal: Const { ty: unsafe fn() {no_sanitize}, val: Value(<ZST>) }
1414
}
1515

‎tests/mir-opt/inline/inline_compatibility.not_inlined_target_feature.Inline.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
StorageLive(_1); // scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:21
1010
_1 = target_feature() -> bb1; // scope 0 at $DIR/inline_compatibility.rs:+1:5: +1:21
1111
// mir::Constant
12-
// + span: $DIR/inline_compatibility.rs:18:5: 18:19
12+
// + span: $DIR/inline_compatibility.rs:17:5: 17:19
1313
// + literal: Const { ty: unsafe fn() {target_feature}, val: Value(<ZST>) }
1414
}
1515

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