simplify field writing further

Author: RalfJung

src/shims/unix/fs.rs

@@ -983,8 +983,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     MiriMemoryKind::Runtime.into(),
                     AllocInit::Uninit,
                 )?;
-                let entry: Pointer = entry.into();
-                let entry_place = &this.ptr_to_mplace(entry, dirent_layout);
+                let entry = this.ptr_to_mplace(entry.into(), dirent_layout);
 
                 // If the host is a Unix system, fill in the inode number with its real value.
                 // If not, use 0 as a fallback value.
@@ -1000,22 +999,22 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     if this.tcx.sess.target.os == "macos" { "d_seekoff" } else { "d_off" };
                 this.write_int_fields_named(
                     &[(ino_name, ino.into()), (off_name, 0), ("d_reclen", size.into())],
-                    entry_place,
+                    &entry,
                 )?;
 
-                if let Some(d_namlen) = this.try_project_field_named(entry_place, "d_namlen")? {
+                if let Some(d_namlen) = this.try_project_field_named(&entry, "d_namlen")? {
                     this.write_int(name_len.strict_sub(1), &d_namlen)?;
                 }
 
                 let file_type = this.file_type_to_d_type(dir_entry.file_type())?;
-                if let Some(d_type) = this.try_project_field_named(entry_place, "d_type")? {
+                if let Some(d_type) = this.try_project_field_named(&entry, "d_type")? {
                     this.write_int(file_type, &d_type)?;
                 }
 
-                let name_ptr = entry.wrapping_offset(Size::from_bytes(d_name_offset), this);
+                let name_ptr = entry.ptr().wrapping_offset(Size::from_bytes(d_name_offset), this);
                 this.write_bytes_ptr(name_ptr, name_bytes.iter().copied())?;
 
-                Some(entry)
+                Some(entry.ptr())
             }
             None => {
                 // end of stream: return NULL