Merge pull request #4455 from RalfJung/rustup

RalfJung · web-flow · commit d22969ec434c · 2025-07-08T06:59:33.000Z
Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-ca98d4d4b3114116203699c2734805547df86f9a
+688ea65df6a47866d0f72a00f1e18b47a7edf83b
diff --git a/src/concurrency/thread.rs b/src/concurrency/thread.rs
@@ -894,7 +894,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             start_abi,
             &[func_arg],
             Some(&ret_place),
-            StackPopCleanup::Root { cleanup: true },
+            ReturnContinuation::Stop { cleanup: true },
         )?;
 
         // Restore the old active thread frame.
diff --git a/src/eval.rs b/src/eval.rs
@@ -436,7 +436,7 @@ pub fn create_ecx<'tcx>(
                     ImmTy::from_uint(sigpipe, ecx.machine.layouts.u8),
                 ],
                 Some(&ret_place),
-                StackPopCleanup::Root { cleanup: true },
+                ReturnContinuation::Stop { cleanup: true },
             )?;
         }
         MiriEntryFnType::MiriStart => {
@@ -445,7 +445,7 @@ pub fn create_ecx<'tcx>(
                 ExternAbi::Rust,
                 &[argc, argv],
                 Some(&ret_place),
-                StackPopCleanup::Root { cleanup: true },
+                ReturnContinuation::Stop { cleanup: true },
             )?;
         }
     }
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -444,7 +444,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         caller_abi: ExternAbi,
         args: &[ImmTy<'tcx>],
         dest: Option<&MPlaceTy<'tcx>>,
-        stack_pop: StackPopCleanup,
+        cont: ReturnContinuation,
     ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
 
@@ -472,7 +472,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             &args.iter().map(|a| FnArg::Copy(a.clone().into())).collect::<Vec<_>>(),
             /*with_caller_location*/ false,
             &dest.into(),
-            stack_pop,
+            cont,
         )
     }
 
diff --git a/src/machine.rs b/src/machine.rs
@@ -1199,7 +1199,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
             ExternAbi::Rust,
             &[],
             None,
-            StackPopCleanup::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },
+            ReturnContinuation::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },
         )?;
         interp_ok(())
     }
diff --git a/src/shims/panic.rs b/src/shims/panic.rs
@@ -22,7 +22,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             ExternAbi::Rust,
             &[this.mplace_to_ref(&msg)?],
             None,
-            StackPopCleanup::Goto { ret: None, unwind },
+            ReturnContinuation::Goto { ret: None, unwind },
         )
     }
 
@@ -41,7 +41,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             ExternAbi::Rust,
             &[this.mplace_to_ref(&msg)?],
             None,
-            StackPopCleanup::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },
+            ReturnContinuation::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },
         )
     }
 
@@ -70,7 +70,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     ExternAbi::Rust,
                     &[index, len],
                     None,
-                    StackPopCleanup::Goto { ret: None, unwind },
+                    ReturnContinuation::Goto { ret: None, unwind },
                 )?;
             }
             MisalignedPointerDereference { required, found } => {
@@ -91,7 +91,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     ExternAbi::Rust,
                     &[required, found],
                     None,
-                    StackPopCleanup::Goto { ret: None, unwind },
+                    ReturnContinuation::Goto { ret: None, unwind },
                 )?;
             }
 
@@ -104,7 +104,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     ExternAbi::Rust,
                     &[],
                     None,
-                    StackPopCleanup::Goto { ret: None, unwind },
+                    ReturnContinuation::Goto { ret: None, unwind },
                 )?;
             }
         }
diff --git a/src/shims/tls.rs b/src/shims/tls.rs
@@ -325,7 +325,7 @@ trait EvalContextPrivExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             ExternAbi::System { unwind: false },
             &[null_ptr.clone(), ImmTy::from_scalar(reason, this.machine.layouts.u32), null_ptr],
             None,
-            StackPopCleanup::Root { cleanup: true },
+            ReturnContinuation::Stop { cleanup: true },
         )?;
         interp_ok(())
     }
@@ -346,7 +346,7 @@ trait EvalContextPrivExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 ExternAbi::C { unwind: false },
                 &[ImmTy::from_scalar(data, this.machine.layouts.mut_raw_ptr)],
                 None,
-                StackPopCleanup::Root { cleanup: true },
+                ReturnContinuation::Stop { cleanup: true },
             )?;
 
             return interp_ok(Poll::Pending);
@@ -383,7 +383,7 @@ trait EvalContextPrivExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 ExternAbi::C { unwind: false },
                 &[ImmTy::from_scalar(ptr, this.machine.layouts.mut_raw_ptr)],
                 None,
-                StackPopCleanup::Root { cleanup: true },
+                ReturnContinuation::Stop { cleanup: true },
             )?;
 
             return interp_ok(Poll::Pending);
diff --git a/src/shims/unwind.rs b/src/shims/unwind.rs
@@ -93,7 +93,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             &[data.clone()],
             None,
             // Directly return to caller.
-            StackPopCleanup::Goto { ret, unwind: mir::UnwindAction::Continue },
+            ReturnContinuation::Goto { ret, unwind: mir::UnwindAction::Continue },
         )?;
 
         // We ourselves will return `0`, eventually (will be overwritten if we catch a panic).
@@ -144,7 +144,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                 &[catch_unwind.data, payload],
                 None,
                 // Directly return to caller of `catch_unwind`.
-                StackPopCleanup::Goto {
+                ReturnContinuation::Goto {
                     ret: catch_unwind.ret,
                     // `catch_fn` must not unwind.
                     unwind: mir::UnwindAction::Unreachable,

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ca98d4d4b3114116203699c2734805547df86f9a`
	`1`	`+688ea65df6a47866d0f72a00f1e18b47a7edf83b`
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ pub fn create_ecx<'tcx>(`
`436`	`436`	`ImmTy::from_uint(sigpipe, ecx.machine.layouts.u8),`
`437`	`437`	`],`
`438`	`438`	`Some(&ret_place),`
`439`		`- StackPopCleanup::Root { cleanup: true },`
	`439`	`+ ReturnContinuation::Stop { cleanup: true },`
`440`	`440`	`)?;`
`441`	`441`	`}`
`442`	`442`	`MiriEntryFnType::MiriStart => {`
`@@ -445,7 +445,7 @@ pub fn create_ecx<'tcx>(`
`445`	`445`	`ExternAbi::Rust,`
`446`	`446`	`&[argc, argv],`
`447`	`447`	`Some(&ret_place),`
`448`		`- StackPopCleanup::Root { cleanup: true },`
	`448`	`+ ReturnContinuation::Stop { cleanup: true },`
`449`	`449`	`)?;`
`450`	`450`	`}`
`451`	`451`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1199,7 +1199,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {`
`1199`	`1199`	`ExternAbi::Rust,`
`1200`	`1200`	`&[],`
`1201`	`1201`	`None,`
`1202`		`- StackPopCleanup::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },`
	`1202`	`+ ReturnContinuation::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },`
`1203`	`1203`	`)?;`
`1204`	`1204`	`interp_ok(())`
`1205`	`1205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`22`	`22`	`ExternAbi::Rust,`
`23`	`23`	`&[this.mplace_to_ref(&msg)?],`
`24`	`24`	`None,`
`25`		`- StackPopCleanup::Goto { ret: None, unwind },`
	`25`	`+ ReturnContinuation::Goto { ret: None, unwind },`
`26`	`26`	`)`
`27`	`27`	`}`
`28`	`28`
`@@ -41,7 +41,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`41`	`41`	`ExternAbi::Rust,`
`42`	`42`	`&[this.mplace_to_ref(&msg)?],`
`43`	`43`	`None,`
`44`		`- StackPopCleanup::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },`
	`44`	`+ ReturnContinuation::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },`
`45`	`45`	`)`
`46`	`46`	`}`
`47`	`47`
`@@ -70,7 +70,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`70`	`70`	`ExternAbi::Rust,`
`71`	`71`	`&[index, len],`
`72`	`72`	`None,`
`73`		`- StackPopCleanup::Goto { ret: None, unwind },`
	`73`	`+ ReturnContinuation::Goto { ret: None, unwind },`
`74`	`74`	`)?;`
`75`	`75`	`}`
`76`	`76`	`MisalignedPointerDereference { required, found } => {`
`@@ -91,7 +91,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`91`	`91`	`ExternAbi::Rust,`
`92`	`92`	`&[required, found],`
`93`	`93`	`None,`
`94`		`- StackPopCleanup::Goto { ret: None, unwind },`
	`94`	`+ ReturnContinuation::Goto { ret: None, unwind },`
`95`	`95`	`)?;`
`96`	`96`	`}`
`97`	`97`
`@@ -104,7 +104,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`104`	`104`	`ExternAbi::Rust,`
`105`	`105`	`&[],`
`106`	`106`	`None,`
`107`		`- StackPopCleanup::Goto { ret: None, unwind },`
	`107`	`+ ReturnContinuation::Goto { ret: None, unwind },`
`108`	`108`	`)?;`
`109`	`109`	`}`
`110`	`110`	`}`