u64::try_from will now fail if ScalarInt isn't exactly 64 bits, thus we use to_bits with the correct size

oli-obk · oli-obk · commit 6e6c8a86e9f7 · 2020-11-04T13:59:11.000Z
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()))

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ impl<'tcx> CValue<'tcx> {`
`261`	`261`	`fx`
`262`	`262`	`.bcx`
`263`	`263`	`.ins()`
`264`		`- .iconst(clif_ty, u64::try_from(const_val).expect("uint") as i64)`
	`264`	`+ .iconst(clif_ty, const_val.to_bits(layout.size).unwrap() as i64)`
`265`	`265`	`}`
`266`	`266`	`ty::Float(FloatTy::F32) => {`
`267`	`267`	`fx.bcx.ins().f32const(Ieee32::with_bits(u32::try_from(const_val).unwrap()))`