Add custom driver

[rust.git] / src / codegen_i128.rs

diff --git a/src/codegen_i128.rs b/src/codegen_i128.rs
index 2d2aa7e1a1d71d573d9992cab4b2789c177ea3ba..99bd526ad01a8ddc5d9c0a2af5f9faa3108882dc 100644 (file)
--- a/src/codegen_i128.rs
+++ b/src/codegen_i128.rs
@@ -1,8 +1,8 @@
-//! 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<'tcx>(
+pub(crate) fn maybe_codegen<'tcx>(
     fx: &mut FunctionCx<'_, 'tcx, impl Backend>,
     bin_op: BinOp,
     checked: bool,
@@ -98,7 +98,7 @@ pub fn maybe_codegen<'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) {
@@ -108,7 +108,7 @@ pub fn maybe_codegen<'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);