Remove sign extension for ty::Int from CValue::const_val

bjorn3 · bjorn3 · commit 6b54b7c9f447 · 2020-06-05T12:16:05.000+02:00
diff --git a/src/value_and_place.rs b/src/value_and_place.rs
@@ -217,17 +217,13 @@ impl<'tcx> CValue<'tcx> {
                     .iconst(types::I64, (const_val >> 64) as u64 as i64);
                 fx.bcx.ins().iconcat(lsb, msb)
             }
-            ty::Bool | ty::Char | ty::Uint(_) | ty::Ref(..)
+            ty::Bool | ty::Char | ty::Uint(_) | ty::Int(_) | ty::Ref(..)
             | ty::RawPtr(..) => {
                 fx
                     .bcx
                     .ins()
                     .iconst(clif_ty, u64::try_from(const_val).expect("uint") as i64)
             }
-            ty::Int(_) => {
-                let const_val = rustc_middle::mir::interpret::sign_extend(const_val, layout.size);
-                fx.bcx.ins().iconst(clif_ty, i64::try_from(const_val as i128).unwrap())
-            }
             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
`@@ -217,17 +217,13 @@ impl<'tcx> CValue<'tcx> {`
`217`	`217`	`.iconst(types::I64, (const_val >> 64) as u64 as i64);`
`218`	`218`	`fx.bcx.ins().iconcat(lsb, msb)`
`219`	`219`	`}`
`220`		`- ty::Bool \| ty::Char \| ty::Uint(_) \| ty::Ref(..)`
	`220`	`+ ty::Bool \| ty::Char \| ty::Uint(_) \| ty::Int(_) \| ty::Ref(..)`
`221`	`221`	`\| ty::RawPtr(..) => {`
`222`	`222`	`fx`
`223`	`223`	`.bcx`
`224`	`224`	`.ins()`
`225`	`225`	`.iconst(clif_ty, u64::try_from(const_val).expect("uint") as i64)`
`226`	`226`	`}`
`227`		`- ty::Int(_) => {`
`228`		`- let const_val = rustc_middle::mir::interpret::sign_extend(const_val, layout.size);`
`229`		`- fx.bcx.ins().iconst(clif_ty, i64::try_from(const_val as i128).unwrap())`
`230`		`- }`
`231`	`227`	`ty::Float(FloatTy::F32) => {`
`232`	`228`	`fx.bcx.ins().f32const(Ieee32::with_bits(u32::try_from(const_val).unwrap()))`
`233`	`229`	`}`