Skip to content

adjust for StackPopCleanup::None rename #1956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 5, 2022
+7 −7
Merged

adjust for StackPopCleanup::None rename #1956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81751a2
adjust for StackPopCleanup::None rename
RalfJung Jan 4, 2022
522f40b
rustup
RalfJung Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ddabe0775c5f5b551d5eb54e3c4366fb8bec0c92
26c9b0046f96403cdf959e4e1f874ec25f9dbf6f
4 changes: 2 additions & 2 deletions src/eval.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand All @@ -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 },
)?;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/shims/posix/thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/shims/tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down Expand Up @@ -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);
Expand Down