diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-08-28 08:13:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-28 08:13:59 +0200 |
| commit | 32053f760280c6d0ed8b4394947e39e3732702c3 (patch) | |
| tree | ea5d1b2572a0e2745ef38a8e7c154add574fe974 /library/alloc | |
| parent | 9fb586cb520cf1be9aa8e869da864c014fa2d6c2 (diff) | |
| parent | 1087e90a2e131cef7d6d361182585d0e3ae12dc3 (diff) | |
| download | rust-32053f760280c6d0ed8b4394947e39e3732702c3.tar.gz rust-32053f760280c6d0ed8b4394947e39e3732702c3.zip | |
Rollup merge of #115280 - RalfJung:panic-cleanup-triple-backtrace, r=Amanieu
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``
Diffstat (limited to 'library/alloc')
| -rw-r--r-- | library/alloc/src/alloc.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs index 0207923ed18..a548de814c5 100644 --- a/library/alloc/src/alloc.rs +++ b/library/alloc/src/alloc.rs @@ -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, + ) } } } |