Auto merge of #1956 - RalfJung:stack-pop-cleanup, r=RalfJung

adjust for StackPopCleanup::None rename

This is the Miri side of rust-lang/rust#92551

Author: bors

rust-version

@@ -1 +1 @@
-ddabe0775c5f5b551d5eb54e3c4366fb8bec0c92
+26c9b0046f96403cdf959e4e1f874ec25f9dbf6f

src/eval.rs

@@ -247,7 +247,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
                 Abi::Rust,
                 &[Scalar::from_pointer(main_ptr, &ecx).into(), argc.into(), argv],
                 Some(&ret_place.into()),
-                StackPopCleanup::None { cleanup: true },
+                StackPopCleanup::Root { cleanup: true },
             )?;
         }
         EntryFnType::Start => {
@@ -256,7 +256,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
                 Abi::Rust,
                 &[argc.into(), argv],
                 Some(&ret_place.into()),
-                StackPopCleanup::None { cleanup: true },
+                StackPopCleanup::Root { cleanup: true },
             )?;
         }
     }

src/shims/posix/thread.rs

@@ -54,7 +54,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             Abi::C { unwind: false },
             &[*func_arg],
             Some(&ret_place.into()),
-            StackPopCleanup::None { cleanup: true },
+            StackPopCleanup::Root { cleanup: true },
         )?;
 
         // Restore the old active thread frame.

src/shims/tls.rs

@@ -259,7 +259,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             Abi::System { unwind: false },
             &[Scalar::null_ptr(this).into(), reason.into(), Scalar::null_ptr(this).into()],
             Some(&ret_place),
-            StackPopCleanup::None { cleanup: true },
+            StackPopCleanup::Root { cleanup: true },
         )?;
 
         this.enable_thread(active_thread);
@@ -282,7 +282,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 Abi::C { unwind: false },
                 &[data.into()],
                 Some(&ret_place),
-                StackPopCleanup::None { cleanup: true },
+                StackPopCleanup::Root { cleanup: true },
             )?;
 
             // Enable the thread so that it steps through the destructor which
@@ -325,7 +325,7 @@ trait EvalContextPrivExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 Abi::C { unwind: false },
                 &[ptr.into()],
                 Some(&ret_place),
-                StackPopCleanup::None { cleanup: true },
+                StackPopCleanup::Root { cleanup: true },
             )?;
 
             this.enable_thread(active_thread);