nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added a shim around rust_panic to update panic counter

Browse Source
This commit is contained in:
Nikhil Shagrithaya 2016-07-20 18:35:25 +05:30
parent 221000abbe
commit 00b1e88680
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstd/panic.rs
View File

@ -340,5 +340,5 @@ pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {
/// ``` /// ```
#[stable(feature = "resume_unwind", since = "1.9.0")] #[stable(feature = "resume_unwind", since = "1.9.0")]
pub fn resume_unwind(payload: Box<Any + Send>) -> ! { pub fn resume_unwind(payload: Box<Any + Send>) -> ! {
panicking::rust_panic(payload) panicking::update_count_then_panic(payload)
} }

10
src/libstd/panicking.rs
View File

@ -398,6 +398,16 @@ fn rust_panic_with_hook(msg: Box<Any + Send>,
rust_panic(msg) rust_panic(msg)
} }
/// Shim around rust_panic. Called by resume_unwind.
pub fn update_count_then_panic(msg: Box<Any + Send>) -> ! {
PANIC_COUNT.with(|c| {
let prev = c.get();
c.set(prev + 1);
});
rust_panic(msg)
}
/// A private no-mangle function on which to slap yer breakpoints. /// A private no-mangle function on which to slap yer breakpoints.
#[no_mangle] #[no_mangle]
#[allow(private_no_mangle_fns)] // yes we get it, but we like breakpoints #[allow(private_no_mangle_fns)] // yes we get it, but we like breakpoints