Skip to content

Commit d1d40d8

Browse files
committed
Auto merge of #137573 - compiler-errors:rollup-noq9yhp, r=compiler-errors
Rollup of 11 pull requests Successful merges: - #136522 (Remove `feature(dyn_compatible_for_dispatch)` from the compiler) - #137289 (Consolidate and improve error messaging for `CoerceUnsized` and `DispatchFromDyn`) - #137321 (Correct doc about `temp_dir()` behavior on Android) - #137417 (rustc_target: Add more RISC-V atomic-related features) - #137489 (remove `#[rustc_intrinsic_must_be_overridde]`) - #137530 (DWARF mixed versions with LTO on MIPS) - #137543 (std: Fix another new symlink test on Windows) - #137548 (Pass correct `TypingEnv` to `InlineAsmCtxt`) - #137550 (Don't immediately panic if dropck fails without returning errors) - #137552 (Update books) - #137556 (rename simd_shuffle_generic → simd_shuffle_const_generic) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 68acfe4 + 0cf957b commit d1d40d8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/intrinsics/simd.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
633633
this.write_immediate(*val, &dest)?;
634634
}
635635
}
636-
"shuffle_generic" => {
636+
"shuffle_const_generic" => {
637637
let [left, right] = check_arg_count(args)?;
638638
let (left, left_len) = this.project_to_simd(left)?;
639639
let (right, right_len) = this.project_to_simd(right)?;
@@ -657,7 +657,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
657657
this.read_immediate(&this.project_index(&right, right_idx)?)?
658658
} else {
659659
throw_ub_format!(
660-
"`simd_shuffle_generic` index {src_index} is out-of-bounds for 2 vectors with length {dest_len}"
660+
"`simd_shuffle_const_generic` index {src_index} is out-of-bounds for 2 vectors with length {dest_len}"
661661
);
662662
};
663663
this.write_immediate(*val, &dest)?;

tests/pass/intrinsics/portable-simd.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::simd::prelude::*;
1616

1717
#[rustc_intrinsic]
1818
#[rustc_nounwind]
19-
pub unsafe fn simd_shuffle_generic<T, U, const IDX: &'static [u32]>(_x: T, _y: T) -> U;
19+
pub unsafe fn simd_shuffle_const_generic<T, U, const IDX: &'static [u32]>(_x: T, _y: T) -> U;
2020

2121
fn simd_ops_f32() {
2222
let a = f32x4::splat(10.0);
@@ -619,13 +619,13 @@ fn simd_intrinsics() {
619619
simd_select(i8x4::from_array([0, -1, -1, 0]), b, a),
620620
i32x4::from_array([10, 2, 10, 10])
621621
);
622-
assert_eq!(simd_shuffle_generic::<_, i32x4, { &[3, 1, 0, 2] }>(a, b), a,);
622+
assert_eq!(simd_shuffle_const_generic::<_, i32x4, { &[3, 1, 0, 2] }>(a, b), a,);
623623
assert_eq!(
624624
simd_shuffle::<_, _, i32x4>(a, b, const { u32x4::from_array([3u32, 1, 0, 2]) }),
625625
a,
626626
);
627627
assert_eq!(
628-
simd_shuffle_generic::<_, i32x4, { &[7, 5, 4, 6] }>(a, b),
628+
simd_shuffle_const_generic::<_, i32x4, { &[7, 5, 4, 6] }>(a, b),
629629
i32x4::from_array([4, 2, 1, 10]),
630630
);
631631
assert_eq!(

0 commit comments

Comments
 (0)