Fix merge conflicts

[rust.git] / src / machine.rs

diff --git a/src/machine.rs b/src/machine.rs
index 3878a0860538f7f18de97ebb5be56706f40b1421..7904e1cc123b359fbc08603f7325c5abbad80b5d 100644 (file)
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -91,8 +91,8 @@ pub struct Evaluator<'tcx> {
     pub(crate) argv: Option<Pointer<Tag>>,
     pub(crate) cmd_line: Option<Pointer<Tag>>,
 
-    /// Last OS error.
-    pub(crate) last_error: Option<Pointer<Tag>>,
+    /// Last OS error location in memory. It is a 32-bit integer.
+    pub(crate) last_error: Option<MPlaceTy<'tcx, Tag>>,
 
     /// TLS state.
     pub(crate) tls: TlsData<'tcx>,