diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2023-02-13 21:08:15 +0000 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2023-02-27 19:25:16 +0000 |
| commit | 760275d81e67ae8953d40e64ff76691f0a55c5ff (patch) | |
| tree | a203840765e2902b2ed13ade9ced785e750ce85d | |
| parent | eb84167837f241e12f21a806b162cfdea277bdb2 (diff) | |
| download | rust-760275d81e67ae8953d40e64ff76691f0a55c5ff.tar.gz rust-760275d81e67ae8953d40e64ff76691f0a55c5ff.zip | |
Implement checked Shl/Shr at MIR building.
| -rw-r--r-- | src/num.rs | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/num.rs b/src/num.rs index c058ece96d8..fbecdab158c 100644 --- a/src/num.rs +++ b/src/num.rs @@ -170,14 +170,6 @@ pub(crate) fn codegen_checked_int_binop<'tcx>( in_lhs: CValue<'tcx>, in_rhs: CValue<'tcx>, ) -> CValue<'tcx> { - if bin_op != BinOp::Shl && bin_op != BinOp::Shr { - assert_eq!( - in_lhs.layout().ty, - in_rhs.layout().ty, - "checked int binop requires lhs and rhs of same type" - ); - } - let lhs = in_lhs.load_scalar(fx); let rhs = in_rhs.load_scalar(fx); @@ -271,21 +263,6 @@ pub(crate) fn codegen_checked_int_binop<'tcx>( _ => unreachable!("invalid non-integer type {}", ty), } } - BinOp::Shl => { - let val = fx.bcx.ins().ishl(lhs, rhs); - let ty = fx.bcx.func.dfg.value_type(val); - let max_shift = i64::from(ty.bits()) - 1; - let has_overflow = fx.bcx.ins().icmp_imm(IntCC::UnsignedGreaterThan, rhs, max_shift); - (val, has_overflow) - } - BinOp::Shr => { - let val = - if !signed { fx.bcx.ins().ushr(lhs, rhs) } else { fx.bcx.ins().sshr(lhs, rhs) }; - let ty = fx.bcx.func.dfg.value_type(val); - let max_shift = i64::from(ty.bits()) - 1; - let has_overflow = fx.bcx.ins().icmp_imm(IntCC::UnsignedGreaterThan, rhs, max_shift); - (val, has_overflow) - } _ => bug!("binop {:?} on checked int/uint lhs: {:?} rhs: {:?}", bin_op, in_lhs, in_rhs), }; |
