bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move to miri.rs and re-export it

Browse source
This commit is contained in:
Aaron Hill 2019-11-04 15:34:19 -05:00
parent 72b555c160
commit 23900770ab
No known key found for this signature in database
GPG key ID: B4087E510E98B164
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libpanic_unwind/lib.rs
View file

@ -39,6 +39,9 @@ cfg_if::cfg_if! {
if #[cfg(miri)] { if #[cfg(miri)] {
#[path = "miri.rs"] #[path = "miri.rs"]
mod imp; mod imp;
// Export this at the root of the crate so that Miri
// has a stable palce to look it up
pub use imp::miri_panic_trampoline;
} else if #[cfg(target_os = "emscripten")] { } else if #[cfg(target_os = "emscripten")] {
#[path = "emcc.rs"] #[path = "emcc.rs"]
mod imp; mod imp;
@ -98,7 +101,4 @@ pub unsafe extern "C" fn __rust_start_panic(payload: usize) -> u32 {
imp::panic(Box::from_raw((*payload).box_me_up())) imp::panic(Box::from_raw((*payload).box_me_up()))
} }
// A dummy helper function for Miri.
// Used to push an empty stack frame when we start unwinding
#[cfg(miri)]
pub fn miri_panic_trampoline() {}

5
src/libpanic_unwind/miri.rs
View file

@ -21,3 +21,8 @@ pub unsafe fn cleanup(ptr: *mut u8) -> Box<dyn Any + Send> {
fn rust_eh_personality() { fn rust_eh_personality() {
unsafe { core::intrinsics::abort() } unsafe { core::intrinsics::abort() }
} }
// A dummy helper function for Miri.
// Used to push an empty stack frame when we start unwinding
#[cfg(miri)]
pub fn miri_panic_trampoline() {}