Skip to content
Permalink
Browse files

rename update_count_then_panic -> rust_panic_without_hook

  • Loading branch information
RalfJung committed Nov 26, 2019
1 parent 4a19ef9 commit babe9fcbc1d5aa5a6a53b7d2e34777cfe28e2c41
Showing with 5 additions and 4 deletions.
  1. +1 −1 src/libstd/panic.rs
  2. +4 −3 src/libstd/panicking.rs
@@ -425,5 +425,5 @@ pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {
/// ```
#[stable(feature = "resume_unwind", since = "1.9.0")]
pub fn resume_unwind(payload: Box<dyn Any + Send>) -> ! {
panicking::update_count_then_panic(payload)
panicking::rust_panic_without_hook(payload)
}
@@ -491,8 +491,9 @@ fn rust_panic_with_hook(payload: &mut dyn BoxMeUp,
rust_panic(payload)
}

/// Shim around rust_panic. Called by resume_unwind.
pub fn update_count_then_panic(msg: Box<dyn Any + Send>) -> ! {
/// This is the entry point for `resume_unwind`.
/// It just forwards the payload to the panic runtime.
pub fn rust_panic_without_hook(payload: Box<dyn Any + Send>) -> ! {
update_panic_count(1);

struct RewrapBox(Box<dyn Any + Send>);
@@ -507,7 +508,7 @@ pub fn update_count_then_panic(msg: Box<dyn Any + Send>) -> ! {
}
}

rust_panic(&mut RewrapBox(msg))
rust_panic(&mut RewrapBox(payload))
}

/// An unmangled function (through `rustc_std_internal_symbol`) on which to slap

0 comments on commit babe9fc

Please sign in to comment.
You can’t perform that action at this time.