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

Swap usage of drop_panic and foreign_exception

Browse Source
This commit is contained in:
Nick Spinale 2022-09-08 06:57:14 +01:00 committed by Gary Guo
parent 4adf2d434f
commit fe407b61e1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/panic.rs
View File

@ -8,15 +8,15 @@ pub use crate::panic_handler::*;
use crate::panicking::Exception; use crate::panicking::Exception;
#[repr(transparent)] #[repr(transparent)]
struct RustPanic(Box<dyn Any + Send>, ForeignGuard); struct RustPanic(Box<dyn Any + Send>, DropGuard);
struct ForeignGuard; struct DropGuard;
impl Drop for ForeignGuard { impl Drop for DropGuard {
fn drop(&mut self) { fn drop(&mut self) {
#[cfg(feature = "panic-handler")] #[cfg(feature = "panic-handler")]
{ {
foreign_exception(); drop_panic();
} }
core::intrinsics::abort(); core::intrinsics::abort();
} }
@ -45,7 +45,7 @@ unsafe impl Exception for RustPanic {
} }
pub fn begin_panic(payload: Box<dyn Any + Send>) -> UnwindReasonCode { pub fn begin_panic(payload: Box<dyn Any + Send>) -> UnwindReasonCode {
crate::panicking::begin_panic(RustPanic(payload, ForeignGuard)) crate::panicking::begin_panic(RustPanic(payload, DropGuard))
} }
pub fn catch_unwind<R, F: FnOnce() -> R>(f: F) -> Result<R, Box<dyn Any + Send>> { pub fn catch_unwind<R, F: FnOnce() -> R>(f: F) -> Result<R, Box<dyn Any + Send>> {
@ -55,7 +55,7 @@ pub fn catch_unwind<R, F: FnOnce() -> R>(f: F) -> Result<R, Box<dyn Any + Send>>
None => { None => {
#[cfg(feature = "panic-handler")] #[cfg(feature = "panic-handler")]
{ {
drop_panic(); foreign_exception();
} }
core::intrinsics::abort(); core::intrinsics::abort();
} }