bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #115280 - RalfJung:panic-cleanup-triple-backtrace, r=Amanieu

Browse source 
avoid triple-backtrace due to panic-during-cleanup

Supersedes https://github.com/rust-lang/rust/pull/115020
Cc https://github.com/rust-lang/rust/issues/114954
r? ``@Amanieu``
This commit is contained in:
Matthias Krüger 2023-08-28 08:13:59 +02:00 • committed by GitHub
commit 32053f7602
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 90 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
library/alloc/src/alloc.rs
View file

@ -408,9 +408,10 @@ pub mod __alloc_error_handler {
if unsafe { __rust_alloc_error_handler_should_panic != 0 } {
panic!("memory allocation of {size} bytes failed")
} else {
core::panicking::panic_nounwind_fmt(format_args!(
"memory allocation of {size} bytes failed"
))
core::panicking::panic_nounwind_fmt(
format_args!("memory allocation of {size} bytes failed"),
/* force_no_backtrace */ false,
)
}
}
}