diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-04-25 06:46:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 06:46:50 +0200 |
| commit | 2d72abc8f24d0af3b0344cbee14130eaaf90f75f (patch) | |
| tree | 66afe302b8efddeef9f8a787ab8c97f1e7d74102 /compiler/rustc_codegen_gcc/example/alloc_example.rs | |
| parent | 2212354865ed06612db04afda3f245f1488302e4 (diff) | |
| parent | 23a363821de3276747b27754bd0dd03a32991187 (diff) | |
| download | rust-2d72abc8f24d0af3b0344cbee14130eaaf90f75f.tar.gz rust-2d72abc8f24d0af3b0344cbee14130eaaf90f75f.zip | |
Rollup merge of #110782 - matthiaskrgr:revert_panic_oom, r=Amanieu
Revert panic oom This temporarily reverts https://github.com/rust-lang/rust/pull/109507 until https://github.com/rust-lang/rust/issues/110771 is addressed r? `@Amanieu`
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, 6 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/example/alloc_example.rs b/compiler/rustc_codegen_gcc/example/alloc_example.rs index faff1dca23f..754e7931412 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, lang_items)] +#![feature(start, core_intrinsics, alloc_error_handler, lang_items)] #![no_std] extern crate alloc; @@ -21,6 +21,11 @@ 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 {} |