Skip to content

Commit 963507a

Browse files
committed
Stabilize the keylocker_x86 flag, and the kl and widekl target features
1 parent ac17c34 commit 963507a

File tree

6 files changed

+5
-24
lines changed

6 files changed

+5
-24
lines changed

compiler/rustc_feature/src/accepted.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@ declare_features! (
257257
/// Allows some increased flexibility in the name resolution rules,
258258
/// especially around globs and shadowing (RFC 1560).
259259
(accepted, item_like_imports, "1.15.0", Some(35120)),
260+
// Allows using the `kl` and `widekl` target features and the associated intrinsics
261+
(accepted, keylocker_x86, "CURRENT_RUSTC_VERSION", Some(134813)),
260262
/// Allows `'a: { break 'a; }`.
261263
(accepted, label_break_value, "1.65.0", Some(48594)),
262264
/// Allows `let...else` statements.

compiler/rustc_feature/src/unstable.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,6 @@ declare_features! (
545545
(incomplete, inherent_associated_types, "1.52.0", Some(8995)),
546546
/// Allows using `pointer` and `reference` in intra-doc links
547547
(unstable, intra_doc_pointers, "1.51.0", Some(80896)),
548-
// Allows using the `kl` and `widekl` target features and the associated intrinsics
549-
(unstable, keylocker_x86, "1.86.0", Some(134813)),
550548
// Allows setting the threshold for the `large_assignments` lint.
551549
(unstable, large_assignments, "1.52.0", Some(83518)),
552550
/// Allow to have type alias types for inter-crate use.

compiler/rustc_target/src/target_features.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ static X86_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
443443
("fma", Stable, &["avx"]),
444444
("fxsr", Stable, &[]),
445445
("gfni", Unstable(sym::avx512_target_feature), &["sse2"]),
446-
("kl", Unstable(sym::keylocker_x86), &["sse2"]),
446+
("kl", Stable, &["sse2"]),
447447
("lahfsahf", Unstable(sym::lahfsahf_target_feature), &[]),
448448
("lzcnt", Stable, &[]),
449449
("movbe", Stable, &[]),
@@ -471,7 +471,7 @@ static X86_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
471471
("tbm", Unstable(sym::tbm_target_feature), &[]),
472472
("vaes", Unstable(sym::avx512_target_feature), &["avx2", "aes"]),
473473
("vpclmulqdq", Unstable(sym::avx512_target_feature), &["avx", "pclmulqdq"]),
474-
("widekl", Unstable(sym::keylocker_x86), &["kl"]),
474+
("widekl", Stable, &["kl"]),
475475
("x87", Unstable(sym::x87_target_feature), &[]),
476476
("xop", Unstable(sym::xop_target_feature), &[/*"fma4", */ "avx", "sse4a"]),
477477
("xsave", Stable, &[]),

library/core/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@
188188
//
189189
// Target features:
190190
// tidy-alphabetical-start
191+
#![cfg_attr(bootstrap, feature(keylocker_x86))]
191192
#![feature(aarch64_unstable_target_feature)]
192193
#![feature(arm_target_feature)]
193194
#![feature(avx512_target_feature)]
194195
#![feature(hexagon_target_feature)]
195-
#![feature(keylocker_x86)]
196196
#![feature(loongarch_target_feature)]
197197
#![feature(mips_target_feature)]
198198
#![feature(powerpc_target_feature)]

tests/ui/feature-gates/feature-gate-keylocker_x86.rs

Lines changed: 0 additions & 6 deletions
This file was deleted.

tests/ui/feature-gates/feature-gate-keylocker_x86.stderr

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)