Add method to consume io::Error

Author: pvdrz

src/shims/env.rs

@@ -137,7 +137,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 if (bytes.len() as u64) < size {
                     // We add a `/0` terminator
                     bytes.push(0);
-                    // This is ok because the buffer is larger than the path with terminatorhe null terminator.
+                    // This is ok because the buffer is larger than the path with the null terminator.
                     this.memory_mut()
                         .get_mut(buf.alloc_id)?
                         .write_bytes(tcx, buf, &bytes)?;
@@ -146,10 +146,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 let erange = this.eval_libc("ERANGE")?;
                 this.set_last_error(erange)?;
             }
-            Err(e) => this.set_last_error(Scalar::from_int(
-                e.raw_os_error().unwrap(),
-                Size::from_bits(32),
-            ))?,
+            Err(e) => this.consume_io_error(e)?,
         }
         Ok(Scalar::ptr_null(&*this.tcx))
     }
@@ -173,10 +170,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         match env::set_current_dir(path) {
             Ok(()) => Ok(0),
             Err(e) => {
-                this.set_last_error(Scalar::from_int(
-                    e.raw_os_error().unwrap(),
-                    Size::from_bits(32),
-                ))?;
+                this.consume_io_error(e)?;
                 Ok(-1)
             }
         }

src/shims/foreign_items.rs

@@ -987,7 +987,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         self.eval_libc(name).and_then(|scalar| scalar.to_i32())
     }
 
-    fn set_last_error(&mut self, scalar: Scalar<Tag>) -> InterpResult<'tcx, ()> {
+    fn set_last_error(&mut self, scalar: Scalar<Tag>) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
         let tcx = &{ this.tcx.tcx };
         let errno_ptr = this.machine.last_error.unwrap();
@@ -1008,6 +1008,13 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             .read_scalar(tcx, errno_ptr, Size::from_bits(32))?
             .not_undef()
     }
+
+    fn consume_io_error(&mut self, e: std::io::Error) -> InterpResult<'tcx> {
+        self.eval_context_mut().set_last_error(Scalar::from_int(
+            e.raw_os_error().unwrap(),
+            Size::from_bits(32),
+        ))
+    }
 }
 
 // Shims the linux 'getrandom()' syscall.

src/shims/io.rs

@@ -264,10 +264,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         match result {
             Ok(ok) => Ok(ok),
             Err(e) => {
-                self.eval_context_mut().set_last_error(Scalar::from_int(
-                    e.raw_os_error().unwrap(),
-                    Size::from_bits(32),
-                ))?;
+                self.eval_context_mut().consume_io_error(e)?;
                 Ok((-1).into())
             }
         }