diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2020-01-07 16:41:59 +0100 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2020-03-02 11:43:07 +0000 |
| commit | 01d04944cefc61cd684e3554e48068926a5f30ab (patch) | |
| tree | 46acb587cf4decf0b11de1999de8a59e892a94ee /src/libpanic_abort | |
| parent | 35349abeb33893e9d683e507f819c16063e4797e (diff) | |
Apply review feedback
Diffstat (limited to 'src/libpanic_abort')
| -rw-r--r-- | src/libpanic_abort/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/libpanic_abort/lib.rs | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/libpanic_abort/Cargo.toml b/src/libpanic_abort/Cargo.toml index 2bee0b716c7..8ebd95047ac 100644 --- a/src/libpanic_abort/Cargo.toml +++ b/src/libpanic_abort/Cargo.toml @@ -14,3 +14,4 @@ doc = false core = { path = "../libcore" } libc = { version = "0.2", default-features = false } compiler_builtins = "0.1.0" +cfg-if = "0.1.8" diff --git a/src/libpanic_abort/lib.rs b/src/libpanic_abort/lib.rs index fe9196ef231..6ea818ecef8 100644 --- a/src/libpanic_abort/lib.rs +++ b/src/libpanic_abort/lib.rs @@ -20,8 +20,11 @@ use core::any::Any; +// We need the definition of TryPayload for __rust_panic_cleanup. +include!("../libpanic_unwind/payload.rs"); + #[rustc_std_internal_symbol] -pub unsafe extern "C" fn __rust_panic_cleanup(_: *mut u8) -> *mut (dyn Any + Send + 'static) { +pub unsafe extern "C" fn __rust_panic_cleanup(_: TryPayload) -> *mut (dyn Any + Send + 'static) { unreachable!() } |