Move read_byte_helper to ecx

Author: tiif

src/shims/unix/fd.rs

@@ -581,7 +581,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 fd.pread(communicate, &mut bytes, offset, this)
             }
         };
-        read_byte_helper(buf, bytes, result, dest, this)?;
+        self.read_byte_helper(buf, bytes, result, dest)?;
         Ok(())
     }
 
@@ -618,33 +618,35 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         this.write_scalar(res, dest)?;
         Ok(())
     }
-}
-fn read_byte_helper<'tcx>(
-    buf: Pointer,
-    bytes: Vec<u8>,
-    result: InterpResult<'tcx, io::Result<usize>>,
-    dest: &MPlaceTy<'tcx>,
-    ecx: &mut MiriInterpCx<'tcx>,
-) -> InterpResult<'tcx> {
-    // `File::read` never returns a value larger than `count`, so this cannot fail.
-    match result?.map(|c| i64::try_from(c).unwrap()) {
-        // try to pass this the write_ptr inside write
-        // Pass the pointer inside the write function.
-        Ok(read_bytes) => {
-            // If reading to `bytes` did not fail, we write those bytes to the buffer.
-            // Crucially, if fewer than `bytes.len()` bytes were read, only write
-            // that much into the output buffer!
-            ecx.write_bytes_ptr(
-                buf,
-                bytes[..usize::try_from(read_bytes).unwrap()].iter().copied(),
-            )?;
-            ecx.write_scalar(Scalar::from_target_isize(read_bytes, ecx), dest)?;
-            return Ok(());
-        }
-        Err(e) => {
-            ecx.set_last_error_from_io_error(e)?;
-            ecx.write_scalar(Scalar::from_target_isize(-1, ecx), dest)?;
-            return Ok(());
+
+    fn read_byte_helper(
+        &mut self,
+        buf: Pointer,
+        bytes: Vec<u8>,
+        result: InterpResult<'tcx, io::Result<usize>>,
+        dest: &MPlaceTy<'tcx>,
+    ) -> InterpResult<'tcx> {
+        let this = self.eval_context_mut();
+        // `File::read` never returns a value larger than `count`, so this cannot fail.
+        match result?.map(|c| i64::try_from(c).unwrap()) {
+            // try to pass this the write_ptr inside write
+            // Pass the pointer inside the write function.
+            Ok(read_bytes) => {
+                // If reading to `bytes` did not fail, we write those bytes to the buffer.
+                // Crucially, if fewer than `bytes.len()` bytes were read, only write
+                // that much into the output buffer!
+                this.write_bytes_ptr(
+                    buf,
+                    bytes[..usize::try_from(read_bytes).unwrap()].iter().copied(),
+                )?;
+                this.write_scalar(Scalar::from_target_isize(read_bytes, this), dest)?;
+                return Ok(());
+            }
+            Err(e) => {
+                this.set_last_error_from_io_error(e)?;
+                this.write_scalar(Scalar::from_target_isize(-1, this), dest)?;
+                return Ok(());
+            }
         }
     }
 }