u64::try_from will now fail if ScalarInt isn't exactly 64 bits, t…

…hus we use `to_bits` with the correct size
rust-lang · Nov 4, 2020 · 6e6c8a8 · 6e6c8a8
1 parent 97bfff1
commit 6e6c8a8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/compiler/rustc_codegen_cranelift/src/value_and_place.rs b/compiler/rustc_codegen_cranelift/src/value_and_place.rs
@@ -261,7 +261,7 @@ impl<'tcx> CValue<'tcx> {
                 fx
                     .bcx
                     .ins()
-                    .iconst(clif_ty, u64::try_from(const_val).expect("uint") as i64)
+                    .iconst(clif_ty, const_val.to_bits(layout.size).unwrap() as i64)
             }
             ty::Float(FloatTy::F32) => {
                 fx.bcx.ins().f32const(Ieee32::with_bits(u32::try_from(const_val).unwrap()))