Remove write_byte_helper

Author: tiif

src/shims/unix/fd.rs

@@ -621,8 +621,21 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             this.write_scalar(Scalar::from_target_isize(res, this), dest)?;
             return Ok(());
         };
-        self.write_byte_helper(offset, fd, bytes, communicate, dest)?;
-        Ok(())
+
+        let result = match offset {
+            None => fd.write(&fd, communicate, &bytes, this),
+            Some(offset) => {
+                let Ok(offset) = u64::try_from(offset) else {
+                    let einval = this.eval_libc("EINVAL");
+                    this.set_last_error(einval)?;
+                    return Ok(Scalar::from_target_isize(-1, this));
+                };
+                fd.pwrite(communicate, &bytes, offset, this)
+            }
+        };
+
+        let result = result?.map(|c| i64::try_from(c).unwrap());
+        Ok(Scalar::from_target_isize(this.try_unwrap_io_result(result)?, this))
     }
 
     /// This function write bytes to the user supplied buffer and write the total number of bytes
@@ -657,34 +670,4 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             }
         }
     }
-
-    fn write_byte_helper(
-        &mut self,
-        offset: Option<i128>,
-        fd: FileDescriptionRef,
-        bytes: Vec<u8>,
-        communicate: bool,
-        dest: &MPlaceTy<'tcx>,
-    ) -> InterpResult<'tcx> {
-        let this = self.eval_context_mut();
-
-        let result = match offset {
-            None => fd.write(&fd, communicate, &bytes, this),
-            Some(offset) => {
-                let Ok(offset) = u64::try_from(offset) else {
-                    let einval = this.eval_libc("EINVAL");
-                    this.set_last_error(einval)?;
-                    let res = Scalar::from_target_isize(-1, this);
-                    this.write_scalar(res, dest)?;
-                    return Ok(());
-                };
-                fd.pwrite(communicate, &bytes, offset, this)
-            }
-        };
-        // Write the result to the dest place.
-        let result = result?.map(|c| i64::try_from(c).unwrap());
-        let res = Scalar::from_target_isize(this.try_unwrap_io_result(result)?, this);
-        this.write_scalar(res, dest)?;
-        return Ok(());
-    }
 }