diff options
| author | bors <bors@rust-lang.org> | 2019-11-12 21:27:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-12 21:27:04 +0000 |
| commit | a333eed7fc0c903df9d6befcfb40af02148bf255 (patch) | |
| tree | f58c8bd9ef3b92b31916f3a4eda588a00e41fb75 /src/libpanic_unwind/lib.rs | |
| parent | 4f03f4a989d1c8346c19dfb417a77c09b34408b8 (diff) | |
| parent | b4545a4ad625c68479120db845280f4c61b39640 (diff) | |
Auto merge of #60026 - Aaron1011:feature/miri-unwind, r=RalfJung,oli-obk
Add hooks for Miri panic unwinding This commits adds in some additional hooks to allow Miri to properly handle panic unwinding. None of this should have any impact on CTFE mode This supports https://github.com/rust-lang/miri/pull/693
Diffstat (limited to 'src/libpanic_unwind/lib.rs')
| -rw-r--r-- | src/libpanic_unwind/lib.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libpanic_unwind/lib.rs b/src/libpanic_unwind/lib.rs index 7de347446ad..4c6c728f6f7 100644 --- a/src/libpanic_unwind/lib.rs +++ b/src/libpanic_unwind/lib.rs @@ -36,7 +36,10 @@ use core::raw; use core::panic::BoxMeUp; cfg_if::cfg_if! { - if #[cfg(target_os = "emscripten")] { + if #[cfg(miri)] { + #[path = "miri.rs"] + mod imp; + } else if #[cfg(target_os = "emscripten")] { #[path = "emcc.rs"] mod imp; } else if #[cfg(target_arch = "wasm32")] { |