From 6d6c5742896fab93788b4dabb6ba2fcf1881f5e2 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Fri, 16 Apr 2021 14:02:57 +0200 Subject: [PATCH 1/1] Fix rotate_left and rotate_right with 128bit shift amount Fixes #1114 --- example/std_example.rs | 1 + src/intrinsics/mod.rs | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/example/std_example.rs b/example/std_example.rs index 015bbdfed46..437b7726980 100644 --- a/example/std_example.rs +++ b/example/std_example.rs @@ -84,6 +84,7 @@ fn main() { assert_eq!(houndred_i128 as f64, 100.0); assert_eq!(houndred_f32 as i128, 100); assert_eq!(houndred_f64 as i128, 100); + assert_eq!(1u128.rotate_left(2), 4); // Test signed 128bit comparing let max = usize::MAX as i128; diff --git a/src/intrinsics/mod.rs b/src/intrinsics/mod.rs index d08271f853b..c42ad4337c1 100644 --- a/src/intrinsics/mod.rs +++ b/src/intrinsics/mod.rs @@ -632,11 +632,21 @@ pub(crate) fn codegen_intrinsic_call<'tcx>( }; rotate_left, (v x, v y) { let layout = fx.layout_of(T); + let y = if fx.bcx.func.dfg.value_type(y) == types::I128 { + fx.bcx.ins().ireduce(types::I64, y) + } else { + y + }; let res = fx.bcx.ins().rotl(x, y); ret.write_cvalue(fx, CValue::by_val(res, layout)); }; rotate_right, (v x, v y) { let layout = fx.layout_of(T); + let y = if fx.bcx.func.dfg.value_type(y) == types::I128 { + fx.bcx.ins().ireduce(types::I64, y) + } else { + y + }; let res = fx.bcx.ins().rotr(x, y); ret.write_cvalue(fx, CValue::by_val(res, layout)); }; -- 2.44.0