Skip to content

Commit e5f739f

Browse files
committed
Auto merge of #150351 - JonathanBrouwer:rollup-knpqs9d, r=JonathanBrouwer
Rollup of 3 pull requests Successful merges: - rust-lang/rust#150141 (Misc cleanups from reading some borrowck code) - rust-lang/rust#150297 (Fix compile issue in Vita libstd) - rust-lang/rust#150341 (Fix some divergences with the cg_clif subtree) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 93c40fb + 8623d76 commit e5f739f

1 file changed

Lines changed: 1 addition & 9 deletions

File tree

src/intrinsics/simd.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,14 +1005,6 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
10051005
let lane_clif_ty = fx.clif_type(val_lane_ty).unwrap();
10061006
let ret_lane_layout = fx.layout_of(ret_lane_ty);
10071007

1008-
let alignment =
1009-
generic_args[3].expect_const().to_branch()[0].to_leaf().to_simd_alignment();
1010-
1011-
let memflags = match alignment {
1012-
SimdAlign::Unaligned => MemFlags::new().with_notrap(),
1013-
_ => MemFlags::trusted(),
1014-
};
1015-
10161008
for lane_idx in 0..ptr_lane_count {
10171009
let val_lane = val.value_lane(fx, lane_idx).load_scalar(fx);
10181010
let ptr_lane = ptr.value_lane(fx, lane_idx).load_scalar(fx);
@@ -1028,7 +1020,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
10281020
fx.bcx.seal_block(if_disabled);
10291021

10301022
fx.bcx.switch_to_block(if_enabled);
1031-
let res = fx.bcx.ins().load(lane_clif_ty, memflags, ptr_lane, 0);
1023+
let res = fx.bcx.ins().load(lane_clif_ty, MemFlags::trusted(), ptr_lane, 0);
10321024
fx.bcx.ins().jump(next, &[res.into()]);
10331025

10341026
fx.bcx.switch_to_block(if_disabled);

0 commit comments

Comments
 (0)