mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust for StackPopCleanup::None rename

Browse Source
This commit is contained in:
Ralf Jung 2022-01-04 11:14:50 +01:00
parent ad0c24936c
commit 81751a2a00
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eval.rs
View File

@ -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 },
)?;
}
}

2
src/shims/posix/thread.rs
View File

@ -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.

6
src/shims/tls.rs
View File

@ -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);