Auto merge of #2060 - RalfJung:rustup, r=RalfJung

rustup

Cc rust-lang/rust#95844

Author: bors

rust-version

@@ -1 +1 @@
-1a4b9a85634c17a60e8802307510c300a35a4b9b
+fbdb10f9fabe47eb763cb4b52b5721740cc63783

src/operator.rs

@@ -61,7 +61,7 @@ impl<'mir, 'tcx> EvalContextExt<'tcx> for super::MiriEvalContext<'mir, 'tcx> {
                 let pointee_ty =
                     left.layout.ty.builtin_deref(true).expect("Offset called on non-ptr type").ty;
                 let ptr = self.ptr_offset_inbounds(
-                    self.scalar_to_ptr(left.to_scalar()?),
+                    self.scalar_to_ptr(left.to_scalar()?)?,
                     pointee_ty,
                     right.to_scalar()?.to_machine_isize(self)?,
                 )?;

src/shims/panic.rs

@@ -146,7 +146,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
 
             // Push the `catch_fn` stackframe.
             let f_instance =
-                this.get_ptr_fn(this.scalar_to_ptr(catch_unwind.catch_fn))?.as_instance()?;
+                this.get_ptr_fn(this.scalar_to_ptr(catch_unwind.catch_fn)?)?.as_instance()?;
             trace!("catch_fn: {:?}", f_instance);
             let ret_place = MPlaceTy::dangling(this.machine.layouts.unit).into();
             this.call_function(

src/shims/posix/linux/sync.rs

@@ -121,7 +121,7 @@ pub fn futex<'tcx>(
             // The API requires `addr` to be a 4-byte aligned pointer, and will
             // use the 4 bytes at the given address as an (atomic) i32.
             this.check_ptr_access_align(
-                this.scalar_to_ptr(addr_scalar),
+                this.scalar_to_ptr(addr_scalar)?,
                 Size::from_bytes(4),
                 Align::from_bytes(4).unwrap(),
                 CheckInAllocMsg::MemoryAccessTest,

src/shims/tls.rs

@@ -249,7 +249,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             "p_thread_callback",
         ])?;
         let thread_callback =
-            this.get_ptr_fn(this.scalar_to_ptr(thread_callback))?.as_instance()?;
+            this.get_ptr_fn(this.scalar_to_ptr(thread_callback)?)?.as_instance()?;
 
         // The signature of this function is `unsafe extern "system" fn(h: c::LPVOID, dwReason: c::DWORD, pv: c::LPVOID)`.
         let reason = this.eval_path_scalar(&["std", "sys", "windows", "c", "DLL_THREAD_DETACH"])?;