diff options
| author | Aaron Hill <aa1ronham@gmail.com> | 2019-10-29 21:03:30 -0400 |
|---|---|---|
| committer | Aaron Hill <aa1ronham@gmail.com> | 2019-11-11 15:14:35 -0500 |
| commit | b06c83c2004476ed8c0ee880ed7955439da4d35f (patch) | |
| tree | 7c2e7bbf31461c3aa70df428cff00b2f6ec1d954 /src/libpanic_unwind | |
| parent | 5553476d490741efc8e3049401152d5d4ce6a934 (diff) | |
| download | rust-b06c83c2004476ed8c0ee880ed7955439da4d35f.tar.gz rust-b06c83c2004476ed8c0ee880ed7955439da4d35f.zip | |
Add miri trampoline, fix handling of intrinsic return
Diffstat (limited to 'src/libpanic_unwind')
| -rw-r--r-- | src/libpanic_unwind/lib.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libpanic_unwind/lib.rs b/src/libpanic_unwind/lib.rs index 4c6c728f6f7..c8d270406c6 100644 --- a/src/libpanic_unwind/lib.rs +++ b/src/libpanic_unwind/lib.rs @@ -97,3 +97,6 @@ pub unsafe extern "C" fn __rust_start_panic(payload: usize) -> u32 { let payload = payload as *mut &mut dyn BoxMeUp; imp::panic(Box::from_raw((*payload).box_me_up())) } + +#[cfg(miri)] +pub fn miri_panic_trampoline() {} |