change function signatures to enable writing 'target_str' methods

Author: JOE1994

src/helpers.rs

@@ -506,13 +506,13 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
     fn write_os_str_to_target_str(
         &mut self,
         os_str: &OsStr,
-        scalar: Scalar<Tag>,
+        mplace: MPlaceTy<'tcx, Tag>,
         size: u64,
     ) -> InterpResult<'tcx, (bool, u64)> {
         if cfg!(target_os = "unix") {
-            self.write_os_str_to_c_str(os_str, scalar, size)
+            self.write_os_str_to_c_str(os_str, mplace.ptr, size)
         } else if cfg!(target_os = "windows") {
-            self.write_os_str_to_wide_str(os_str, scalar, size)
+            self.write_os_str_to_wide_str(os_str, mplace, size)
         } else {
             panic!("support for target OS not yet available")
         }
@@ -565,7 +565,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
     fn write_os_str_to_wide_str(
         &mut self,
         os_str: &OsStr,
-        scalar: Scalar<Tag>,
+        mplace: MPlaceTy<'tcx, Tag>,
         size: u64,
     ) -> InterpResult<'tcx, (bool, u64)> {
         #[cfg(target_os = "windows")]
@@ -578,32 +578,29 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         }
 
         let u16_vec = os_str_to_u16vec(os_str);
-        // If `size` is smaller or equal than `bytes.len()`, writing `bytes` plus the required null
-        // terminator to memory using the `ptr` pointer would cause an out-of-bounds access.
+        // If `size` is smaller or equal than `bytes.len()`, writing `bytes` plus the required
+        // 0x0000 terminator to memory would cause an out-of-bounds access.
         let string_length = u16_vec.len() as u64;
         if size <= string_length {
             return Ok((false, string_length));
         }
 
         let this = self.eval_context_mut();
 
-        // Store the UTF-16 string. We just allocated so we know the bounds are fine.
+        // Store the UTF-16 string.
         let char_size = Size::from_bytes(2);
-        let place_ptr = scalar.assert_ptr();
-        /*
         for (idx, &c) in u16_vec.iter().enumerate() {
-            let place = this.mplace_field(place, idx as u64)?; 
+            let place = this.mplace_field(mplace, idx as u64)?; 
             this.write_scalar(Scalar::from_uint(c, char_size), place.into())?;
         }
-        */
         Ok((true, string_length))
     }
 
     fn alloc_os_str_as_target_str(
         &mut self,
         os_str: &OsStr,
         memkind: MemoryKind<MiriMemoryKind>,
-    ) -> Pointer<Tag> {
+    ) -> MPlaceTy<'tcx, Tag> {
         if cfg!(target_os = "unix") {
             self.alloc_os_str_as_c_str(os_str, memkind)
         } else if cfg!(target_os = "windows") {
@@ -617,28 +614,28 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         &mut self,
         os_str: &OsStr,
         memkind: MemoryKind<MiriMemoryKind>,
-    ) -> Pointer<Tag> {
+    ) -> MPlaceTy<'tcx, Tag> {
         let size = os_str.len() as u64 + 1; // Make space for `0` terminator.
         let this = self.eval_context_mut();
 
         let arg_type = this.tcx.mk_array(this.tcx.types.u8, size);
         let arg_place = this.allocate(this.layout_of(arg_type).unwrap(), memkind);
         self.write_os_str_to_c_str(os_str, arg_place.ptr, size).unwrap();
-        arg_place.ptr.assert_ptr()
+        arg_place
     }
 
     fn alloc_os_str_as_wide_str(
         &mut self,
         os_str: &OsStr,
         memkind: MemoryKind<MiriMemoryKind>,
-    ) -> Pointer<Tag> {
+    ) -> MPlaceTy<'tcx, Tag> {
         let size = os_str.len() as u64 + 1; // Make space for `0x0000` terminator.
         let this = self.eval_context_mut();
 
         let arg_type = this.tcx.mk_array(this.tcx.types.u16, size);
         let arg_place = this.allocate(this.layout_of(arg_type).unwrap(), memkind);
-        self.write_os_str_to_wide_str(os_str, arg_place.ptr, size).unwrap();
-        arg_place.ptr.assert_ptr()
+        self.write_os_str_to_wide_str(os_str, arg_place, size).unwrap();
+        arg_place
     }
 }
 

src/shims/env.rs

@@ -45,7 +45,7 @@ fn alloc_env_var_as_target_str<'mir, 'tcx>(
     let mut name_osstring = name.to_os_string();
     name_osstring.push("=");
     name_osstring.push(value);
-    ecx.alloc_os_str_as_target_str(name_osstring.as_os_str(), MiriMemoryKind::Machine.into())
+    ecx.alloc_os_str_as_target_str(name_osstring.as_os_str(), MiriMemoryKind::Machine.into()).ptr.assert_ptr()
 }
 
 impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}