Skip to content

Commit 7516645

Browse files
committed
stabilize s390x_target_feature_vector
1 parent c59298d commit 7516645

File tree

19 files changed

+229
-256
lines changed

19 files changed

+229
-256
lines changed

compiler/rustc_feature/src/accepted.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ declare_features! (
387387
(accepted, return_position_impl_trait_in_trait, "1.75.0", Some(91611)),
388388
/// Allows code like `let x: &'static u32 = &42` to work (RFC 1414).
389389
(accepted, rvalue_static_promotion, "1.21.0", Some(38865)),
390+
/// Allows use of the `vector` and related s390x target features.
391+
(accepted, s390x_target_feature_vector, "CURRENT_RUSTC_VERSION", Some(145649)),
390392
/// Allows `Self` in type definitions (RFC 2300).
391393
(accepted, self_in_typedefs, "1.32.0", Some(49303)),
392394
/// Allows `Self` struct constructor (RFC 2302).

compiler/rustc_feature/src/unstable.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@ declare_features! (
343343
(unstable, riscv_target_feature, "1.45.0", Some(44839)),
344344
(unstable, rtm_target_feature, "1.35.0", Some(44839)),
345345
(unstable, s390x_target_feature, "1.82.0", Some(44839)),
346-
(unstable, s390x_target_feature_vector, "CURRENT_RUSTC_VERSION", Some(145649)),
347346
(unstable, sparc_target_feature, "1.84.0", Some(132783)),
348347
(unstable, wasm_target_feature, "1.30.0", Some(44839)),
349348
(unstable, x87_target_feature, "1.85.0", Some(44839)),

compiler/rustc_target/src/target_features.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -844,20 +844,20 @@ const IBMZ_FEATURES: &[(&str, Stability, ImpliedFeatures)] = &[
844844
("message-security-assist-extension8", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3"]),
845845
("message-security-assist-extension9", Unstable(sym::s390x_target_feature), &["message-security-assist-extension3", "message-security-assist-extension4"]),
846846
("message-security-assist-extension12", Unstable(sym::s390x_target_feature), &[]),
847-
("miscellaneous-extensions-2", Unstable(sym::s390x_target_feature_vector), &[]),
848-
("miscellaneous-extensions-3", Unstable(sym::s390x_target_feature_vector), &[]),
849-
("miscellaneous-extensions-4", Unstable(sym::s390x_target_feature_vector), &[]),
850-
("nnp-assist", Unstable(sym::s390x_target_feature_vector), &["vector"]),
847+
("miscellaneous-extensions-2", Stable, &[]),
848+
("miscellaneous-extensions-3", Stable, &[]),
849+
("miscellaneous-extensions-4", Stable, &[]),
850+
("nnp-assist", Stable, &["vector"]),
851851
("soft-float", Forbidden { reason: "currently unsupported ABI-configuration feature" }, &[]),
852852
("transactional-execution", Unstable(sym::s390x_target_feature), &[]),
853-
("vector", Unstable(sym::s390x_target_feature_vector), &[]),
854-
("vector-enhancements-1", Unstable(sym::s390x_target_feature_vector), &["vector"]),
855-
("vector-enhancements-2", Unstable(sym::s390x_target_feature_vector), &["vector-enhancements-1"]),
856-
("vector-enhancements-3", Unstable(sym::s390x_target_feature_vector), &["vector-enhancements-2"]),
857-
("vector-packed-decimal", Unstable(sym::s390x_target_feature_vector), &["vector"]),
858-
("vector-packed-decimal-enhancement", Unstable(sym::s390x_target_feature_vector), &["vector-packed-decimal"]),
859-
("vector-packed-decimal-enhancement-2", Unstable(sym::s390x_target_feature_vector), &["vector-packed-decimal-enhancement"]),
860-
("vector-packed-decimal-enhancement-3", Unstable(sym::s390x_target_feature_vector), &["vector-packed-decimal-enhancement-2"]),
853+
("vector", Stable, &[]),
854+
("vector-enhancements-1", Stable, &["vector"]),
855+
("vector-enhancements-2", Stable, &["vector-enhancements-1"]),
856+
("vector-enhancements-3", Stable, &["vector-enhancements-2"]),
857+
("vector-packed-decimal", Stable, &["vector"]),
858+
("vector-packed-decimal-enhancement", Stable, &["vector-packed-decimal"]),
859+
("vector-packed-decimal-enhancement-2", Stable, &["vector-packed-decimal-enhancement"]),
860+
("vector-packed-decimal-enhancement-3", Stable, &["vector-packed-decimal-enhancement-2"]),
861861
// tidy-alphabetical-end
862862
];
863863

library/core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@
204204
#![feature(riscv_target_feature)]
205205
#![feature(rtm_target_feature)]
206206
#![feature(s390x_target_feature)]
207-
#![feature(s390x_target_feature_vector)]
208207
#![feature(wasm_target_feature)]
209208
#![feature(x86_amx_intrinsics)]
210209
// tidy-alphabetical-end

library/std_detect/src/detect/arch/s390x.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,30 @@ features! {
3232
/// s390x message-security-assist-extension9 facility
3333
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] message_security_assist_extension12: "message-security-assist-extension12";
3434
/// s390x message-security-assist-extension12 facility
35-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] miscellaneous_extensions_2: "miscellaneous-extensions-2";
35+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] miscellaneous_extensions_2: "miscellaneous-extensions-2";
3636
/// s390x miscellaneous-extensions-2 facility
37-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] miscellaneous_extensions_3: "miscellaneous-extensions-3";
37+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] miscellaneous_extensions_3: "miscellaneous-extensions-3";
3838
/// s390x miscellaneous-extensions-3 facility
39-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] miscellaneous_extensions_4: "miscellaneous-extensions-4";
39+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] miscellaneous_extensions_4: "miscellaneous-extensions-4";
4040
/// s390x miscellaneous-extensions-4 facility
41-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] nnp_assist: "nnp-assist";
41+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] nnp_assist: "nnp-assist";
4242
/// s390x nnp-assist facility
4343
@FEATURE: #[unstable(feature = "s390x_target_feature", issue = "44839")] transactional_execution: "transactional-execution";
4444
/// s390x transactional-execution facility
45-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] vector: "vector";
45+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector: "vector";
4646
/// s390x vector facility
47-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] vector_enhancements_1: "vector-enhancements-1";
47+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_enhancements_1: "vector-enhancements-1";
4848
/// s390x vector-enhancements-1 facility
49-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] vector_enhancements_2: "vector-enhancements-2";
49+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_enhancements_2: "vector-enhancements-2";
5050
/// s390x vector-enhancements-2 facility
51-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] vector_enhancements_3: "vector-enhancements-3";
51+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_enhancements_3: "vector-enhancements-3";
5252
/// s390x vector-enhancements-3 facility
53-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] vector_packed_decimal: "vector-packed-decimal";
53+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_packed_decimal: "vector-packed-decimal";
5454
/// s390x vector-packed-decimal facility
55-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] vector_packed_decimal_enhancement: "vector-packed-decimal-enhancement";
55+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_packed_decimal_enhancement: "vector-packed-decimal-enhancement";
5656
/// s390x vector-packed-decimal-enhancement facility
57-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] vector_packed_decimal_enhancement_2: "vector-packed-decimal-enhancement-2";
57+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_packed_decimal_enhancement_2: "vector-packed-decimal-enhancement-2";
5858
/// s390x vector-packed-decimal-enhancement-2 facility
59-
@FEATURE: #[unstable(feature = "s390x_target_feature_vector", issue = "145649")] vector_packed_decimal_enhancement_3: "vector-packed-decimal-enhancement-3";
59+
@FEATURE: #[stable(feature = "s390x_target_feature_vector", since = "CURRENT_RUSTC_VERSION")] vector_packed_decimal_enhancement_3: "vector-packed-decimal-enhancement-3";
6060
/// s390x vector-packed-decimal-enhancement-3 facility
6161
}

library/stdarch/crates/core_arch/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
arm_target_feature,
2323
mips_target_feature,
2424
powerpc_target_feature,
25-
s390x_target_feature_vector,
2625
loongarch_target_feature,
2726
wasm_target_feature,
2827
abi_unadjusted,

tests/assembly-llvm/s390x-vector-abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//@[z13_no_vector] compile-flags: --target s390x-unknown-linux-gnu -C target-cpu=z13 -C target-feature=-vector --cfg no_vector
1313
//@[z13_no_vector] needs-llvm-components: systemz
1414

15-
#![feature(no_core, lang_items, repr_simd, s390x_target_feature_vector)]
15+
#![feature(no_core, lang_items, repr_simd)]
1616
#![no_core]
1717
#![crate_type = "lib"]
1818
#![allow(non_camel_case_types)]

tests/codegen-llvm/s390x-simd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#![crate_type = "rlib"]
88
#![feature(no_core, asm_experimental_arch)]
9-
#![feature(s390x_target_feature_vector, simd_ffi, intrinsics, repr_simd)]
9+
#![feature(simd_ffi, intrinsics, repr_simd)]
1010
#![no_core]
1111

1212
extern crate minicore;

tests/codegen-llvm/simd/extract-insert-dyn.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
repr_simd,
66
arm_target_feature,
77
mips_target_feature,
8-
s390x_target_feature_vector,
98
riscv_target_feature
109
)]
1110
#![no_std]

tests/ui/abi/simd-abi-checks-s390x.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
//@[z13_soft_float] needs-llvm-components: systemz
1111
//@ ignore-backends: gcc
1212
//[z13_soft_float]~? WARN must be disabled to ensure that the ABI of the current target can be implemented correctly
13-
14-
//[z13_no_vector,z13_soft_float]~? WARN unstable feature specified for `-Ctarget-feature`
1513
//[z13_soft_float]~? WARN target feature `soft-float` cannot be enabled with `-Ctarget-feature`
1614

17-
#![feature(no_core, repr_simd, s390x_target_feature_vector)]
15+
#![feature(no_core, repr_simd)]
1816
#![no_core]
1917
#![crate_type = "lib"]
2018
#![allow(non_camel_case_types, improper_ctypes_definitions)]

0 commit comments

Comments
 (0)