Transform the last error place to an immediate instead

pvdrz · pvdrz · commit 8a8fa53a5d28 · 2019-10-20T07:55:26.000-05:00
diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
@@ -415,8 +415,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
 
             "__errno_location" | "__error" => {
                 let errno_place = this.machine.last_error.unwrap();
-                let errno_scalar: Scalar<Tag> = this.check_mplace_access(errno_place.into(), Some(Size::from_bits(32)))?.unwrap().into();
-                this.write_scalar(errno_scalar, dest)?;
+                this.write_scalar(errno_place.to_ref().to_scalar()?, dest)?;
             }
 
             "getenv" => {

Original file line number	Diff line number	Diff line change
`@@ -415,8 +415,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx`
`415`	`415`
`416`	`416`	`"__errno_location" \| "__error" => {`
`417`	`417`	`let errno_place = this.machine.last_error.unwrap();`
`418`		`- let errno_scalar: Scalar<Tag> = this.check_mplace_access(errno_place.into(), Some(Size::from_bits(32)))?.unwrap().into();`
`419`		`- this.write_scalar(errno_scalar, dest)?;`
	`418`	`+ this.write_scalar(errno_place.to_ref().to_scalar()?, dest)?;`
`420`	`419`	`}`
`421`	`420`
`422`	`421`	`"getenv" => {`