Fix merge conflicts

[rust.git] / src / shims / foreign_items.rs

diff --git a/src/shims/foreign_items.rs b/src/shims/foreign_items.rs
index 5d2c3648b43a5e61c8d1634471f9858860e9ab04..1933aee1151dc3b3b4cef7b8a5a610ca1ff55b90 100644 (file)
--- a/src/shims/foreign_items.rs
+++ b/src/shims/foreign_items.rs
@@ -414,8 +414,8 @@ fn emulate_foreign_item(
             }
 
             "__errno_location" | "__error" => {
-                let errno_scalar: Scalar<Tag> = this.machine.last_error.unwrap().into();
-                this.write_scalar(errno_scalar, dest)?;
+                let errno_place = this.machine.last_error.unwrap();
+                this.write_scalar(errno_place.to_ref().to_scalar()?, dest)?;
             }
 
             "getenv" => {