diff options
| author | bors <bors@rust-lang.org> | 2016-08-11 01:58:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 01:58:48 -0700 |
| commit | 695b3d8279e17689b988e000203ba95ffeb4a91c (patch) | |
| tree | 2ead4208b3bcc7c6f990b8f34ecb83e4a96f9e1f /src/libstd/panic.rs | |
| parent | 1222f5d52ba0586d67c32a5bc4a3097eb9574aae (diff) | |
| parent | ea2216cba88f225c758070fd457e321a58c63951 (diff) | |
| download | rust-695b3d8279e17689b988e000203ba95ffeb4a91c.tar.gz rust-695b3d8279e17689b988e000203ba95ffeb4a91c.zip | |
Auto merge of #34866 - cynicaldevil:panic-counter, r=alexcrichton
Refactored code to access TLS only in case of panic (II) Fixes #34787 r? @alexcrichton Do it **very** carefully this time!
Diffstat (limited to 'src/libstd/panic.rs')
| -rw-r--r-- | src/libstd/panic.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index ba18d15f5c4..2f67081e0d7 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -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")] pub fn resume_unwind(payload: Box<Any + Send>) -> ! { - panicking::rust_panic(payload) + panicking::update_count_then_panic(payload) } |