Skip to content

Commit b37d587

Browse files
committed
Auto merge of #141232 - fmease:rollup-qr9mobf, r=fmease
Rollup of 8 pull requests Successful merges: - #138940 (Stabilize the avx512 target features) - #140490 (split `asm!` parsing and validation) - #140628 (std: stop using TLS in signal handler) - #140746 (name resolution for guard patterns) - #140926 (Return value of coroutine_layout fn changed to Result with LayoutError) - #141127 (bump windows crate for compiler,bootstrap and tools) - #141214 (Miri subtree update) - #141218 (gvn: avoid creating overlapping assignments) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e14f285 + 24bb8d3 commit b37d587

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

cargo-miri/src/phases.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,11 @@ pub fn phase_cargo_miri(mut args: impl Iterator<Item = String>) {
176176
// Set `--target-dir` to `miri` inside the original target directory.
177177
let target_dir = get_target_dir(&metadata);
178178
cmd.arg("--target-dir").arg(target_dir);
179-
// Enable cross-target doctests (for consistency between different cargo versions).
180-
cmd.arg("-Zdoctest-xcompile");
179+
// Only when running in x.py (where we are running with beta cargo): set `RUSTC_STAGE`.
180+
// Will have to be removed on next bootstrap bump. tag: cfg(bootstrap).
181+
if env::var_os("RUSTC_STAGE").is_some() {
182+
cmd.arg("-Zdoctest-xcompile");
183+
}
181184

182185
// *After* we set all the flags that need setting, forward everything else. Make sure to skip
183186
// `--target-dir` (which would otherwise be set twice).

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a69bc17fb8026bdc0d24bb1896ff95f0eba1da4e
1+
ac17c3486c6fdfbb0c3c18b99f3d8dfbff625d29

src/helpers.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,11 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
933933
}
934934

935935
/// Check that the calling convention is what we expect.
936-
fn check_callconv<'a>(&self, fn_abi: &FnAbi<'tcx, Ty<'tcx>>, exp_abi: Conv) -> InterpResult<'a, ()> {
936+
fn check_callconv<'a>(
937+
&self,
938+
fn_abi: &FnAbi<'tcx, Ty<'tcx>>,
939+
exp_abi: Conv,
940+
) -> InterpResult<'a, ()> {
937941
if fn_abi.conv != exp_abi {
938942
throw_ub_format!(
939943
"calling a function with calling convention {exp_abi} using caller calling convention {}",

tests/pass/shims/x86/intrinsics-x86-aes-vaes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//@only-target: x86_64 i686
33
//@compile-flags: -C target-feature=+aes,+vaes,+avx512f
44

5-
#![feature(avx512_target_feature, stdarch_x86_avx512)]
5+
#![feature(stdarch_x86_avx512)]
66

77
use core::mem::transmute;
88
#[cfg(target_arch = "x86")]

tests/pass/shims/x86/intrinsics-x86-avx512.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//@only-target: x86_64 i686
33
//@compile-flags: -C target-feature=+avx512f,+avx512vl,+avx512bitalg,+avx512vpopcntdq
44

5-
#![feature(avx512_target_feature)]
65
#![feature(stdarch_x86_avx512)]
76

87
#[cfg(target_arch = "x86")]

tests/pass/shims/x86/intrinsics-x86-gfni.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// be interpreted as integers; signedness does not make sense for them, but
77
// __mXXXi happens to be defined in terms of signed integers.
88
#![allow(overflowing_literals)]
9-
#![feature(avx512_target_feature)]
109
#![feature(stdarch_x86_avx512)]
1110

1211
#[cfg(target_arch = "x86")]

tests/pass/shims/x86/intrinsics-x86-vpclmulqdq.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// be interpreted as integers; signedness does not make sense for them, but
99
// __mXXXi happens to be defined in terms of signed integers.
1010
#![allow(overflowing_literals)]
11-
#![feature(avx512_target_feature)]
1211
#![feature(stdarch_x86_avx512)]
1312

1413
#[cfg(target_arch = "x86")]

0 commit comments

Comments
 (0)