Add custom driver

[rust.git] / src / codegen_i128.rs

diff --git a/src/codegen_i128.rs b/src/codegen_i128.rs
index cfe5ce5918f74c506a1d040c9b80c07bbdf97279..99bd526ad01a8ddc5d9c0a2af5f9faa3108882dc 100644 (file)
--- a/src/codegen_i128.rs
+++ b/src/codegen_i128.rs
@@ -1,9 +1,9 @@
-//! Replaces 128-bit operators with lang item calls
+//! Replaces 128-bit operators with lang item calls where necessary
 
 use crate::prelude::*;
 
-pub fn maybe_codegen<'a, 'tcx>(
-    fx: &mut FunctionCx<'a, 'tcx, impl Backend>,
+pub(crate) fn maybe_codegen<'tcx>(
+    fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
     bin_op: BinOp,
     checked: bool,
     lhs: CValue<'tcx>,
@@ -30,7 +30,7 @@ pub fn maybe_codegen<'a, 'tcx>(
                 fx.easy_call("__rust_i128_addo", &[lhs, rhs], out_ty)
             } else {
                 fx.easy_call("__rust_u128_addo", &[lhs, rhs], out_ty)
-            })
+            });
         }
         BinOp::Sub => {
             let out_ty = fx.tcx.mk_tup([lhs.layout().ty, fx.tcx.types.bool].iter());
@@ -38,7 +38,7 @@ pub fn maybe_codegen<'a, 'tcx>(
                 fx.easy_call("__rust_i128_subo", &[lhs, rhs], out_ty)
             } else {
                 fx.easy_call("__rust_u128_subo", &[lhs, rhs], out_ty)
-            })
+            });
         }
         BinOp::Offset => unreachable!("offset should only be used on pointers, not 128bit ints"),
         BinOp::Mul => {
@@ -50,7 +50,11 @@ pub fn maybe_codegen<'a, 'tcx>(
                     fx.easy_call("__rust_u128_mulo", &[lhs, rhs], out_ty)
                 }
             } else {
-                let val_ty = if is_signed { fx.tcx.types.i128 } else { fx.tcx.types.u128 };
+                let val_ty = if is_signed {
+                    fx.tcx.types.i128
+                } else {
+                    fx.tcx.types.u128
+                };
                 fx.easy_call("__multi3", &[lhs, rhs], val_ty)
             };
             return Some(res);
@@ -94,7 +98,7 @@ pub fn maybe_codegen<'a, 'tcx>(
             // Optimize `val >> 64`, because compiler_builtins uses it to deconstruct an 128bit
             // integer into its lsb and msb.
             // https://github.com/rust-lang-nursery/compiler-builtins/blob/79a6a1603d5672cbb9187ff41ff4d9b5048ac1cb/src/int/mod.rs#L217
-            if let Some(64) = resolve_value_imm(fx.bcx.func, rhs_val) {
+            if resolve_value_imm(fx.bcx.func, rhs_val) == Some(64) {
                 let (lhs_lsb, lhs_msb) = fx.bcx.ins().isplit(lhs_val);
                 let all_zeros = fx.bcx.ins().iconst(types::I64, 0);
                 let val = match (bin_op, is_signed) {
@@ -104,24 +108,28 @@ pub fn maybe_codegen<'a, 'tcx>(
                     }
                     (BinOp::Shr, true) => {
                         let sign = fx.bcx.ins().icmp_imm(IntCC::SignedLessThan, lhs_msb, 0);
-                        let all_ones = fx.bcx.ins().iconst(types::I64, u64::max_value() as i64);
+                        let all_ones = fx.bcx.ins().iconst(types::I64, u64::MAX as i64);
                         let all_sign_bits = fx.bcx.ins().select(sign, all_zeros, all_ones);
 
                         let val = fx.bcx.ins().iconcat(lhs_msb, all_sign_bits);
                         Some(CValue::by_val(val, fx.layout_of(fx.tcx.types.i128)))
                     }
                     (BinOp::Shl, _) => {
-                        let val_ty = if is_signed { fx.tcx.types.i128 } else { fx.tcx.types.u128 };
+                        let val_ty = if is_signed {
+                            fx.tcx.types.i128
+                        } else {
+                            fx.tcx.types.u128
+                        };
                         let val = fx.bcx.ins().iconcat(all_zeros, lhs_lsb);
                         Some(CValue::by_val(val, fx.layout_of(val_ty)))
                     }
-                    _ => None
+                    _ => None,
                 };
                 if let Some(val) = val {
                     if let Some(is_overflow) = is_overflow {
                         let out_ty = fx.tcx.mk_tup([lhs.layout().ty, fx.tcx.types.bool].iter());
                         let val = val.load_scalar(fx);
-                        return Some(CValue::by_val_pair(val, is_overflow, fx.layout_of(out_ty)))
+                        return Some(CValue::by_val_pair(val, is_overflow, fx.layout_of(out_ty)));
                     } else {
                         return Some(val);
                     }