Update to latest upstream

Author: pvdrz

src/shims/fs.rs

@@ -100,12 +100,14 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             throw_unsup_format!("unsupported flags {:#x}", flag & !mirror);
         }
 
-        let path = this.read_os_str_from_c_str(this.read_scalar(path_op)?.not_undef()?)?;
+        let path: PathBuf = this
+            .read_os_str_from_c_str(this.read_scalar(path_op)?.not_undef()?)?
+            .into();
 
         let fd = options.open(&path).map(|file| {
             let mut fh = &mut this.machine.file_handler;
             fh.low += 1;
-            fh.handles.insert(fh.low, FileHandle { file, path: path.into() }).unwrap_none();
+            fh.handles.insert(fh.low, FileHandle { file, path }).unwrap_none();
             fh.low
         });
 
@@ -297,7 +299,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let statxbuf_imm = ImmTy::from_scalar(Scalar::Ptr(statxbuf_ptr), statxbuf_layout);
         let statxbuf_place = this.ref_to_mplace(statxbuf_imm)?;
 
-        let pathname: PathBuf = this.read_os_string_from_c_string(pathname_scalar)?.into();
+        let pathname: PathBuf = this.read_os_str_from_c_str(pathname_scalar)?.into();
         let flags = this.read_scalar(flags_op)?.to_i64()? as i32;
 
         let at_empty_path = this.eval_libc_i32("AT_EMPTY_PATH")?;