diff options
| author | bors <bors@rust-lang.org> | 2023-04-22 12:27:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-22 12:27:45 +0000 |
| commit | 39cf520299794e6c1b6b471db5d9935e0c6271ab (patch) | |
| tree | 73cb9a139e96bd86137ba715a490d00ea12c5b77 /compiler/rustc_codegen_gcc/example/alloc_example.rs | |
| parent | 21fab435da99d6ef14c1c870650ee976499564f3 (diff) | |
| parent | 4da05e0b88d8b51fc6912da2d0b93edb2780e76b (diff) | |
| download | rust-39cf520299794e6c1b6b471db5d9935e0c6271ab.tar.gz rust-39cf520299794e6c1b6b471db5d9935e0c6271ab.zip | |
Auto merge of #109507 - Amanieu:panic-oom-payload, r=davidtwco
Report allocation errors as panics OOM is now reported as a panic but with a custom payload type (`AllocErrorPanicPayload`) which holds the layout that was passed to `handle_alloc_error`. This should be review one commit at a time: - The first commit adds `AllocErrorPanicPayload` and changes allocation errors to always be reported as panics. - The second commit removes `#[alloc_error_handler]` and the `alloc_error_hook` API. ACP: https://github.com/rust-lang/libs-team/issues/192 Closes #51540 Closes #51245
Diffstat (limited to 'compiler/rustc_codegen_gcc/example/alloc_example.rs')
| -rw-r--r-- | compiler/rustc_codegen_gcc/example/alloc_example.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_gcc/example/alloc_example.rs b/compiler/rustc_codegen_gcc/example/alloc_example.rs index 754e7931412..faff1dca23f 100644 --- a/compiler/rustc_codegen_gcc/example/alloc_example.rs +++ b/compiler/rustc_codegen_gcc/example/alloc_example.rs @@ -1,4 +1,4 @@ -#![feature(start, core_intrinsics, alloc_error_handler, lang_items)] +#![feature(start, core_intrinsics, lang_items)] #![no_std] extern crate alloc; @@ -21,11 +21,6 @@ fn panic_handler(_: &core::panic::PanicInfo) -> ! { core::intrinsics::abort(); } -#[alloc_error_handler] -fn alloc_error_handler(_: alloc::alloc::Layout) -> ! { - core::intrinsics::abort(); -} - #[lang = "eh_personality"] fn eh_personality() -> ! { loop {} |
