diff options
| author | bors <bors@rust-lang.org> | 2023-04-25 04:58:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-25 04:58:54 +0000 |
| commit | ed3ddb375bf18099a885605efba94dc1e50379d7 (patch) | |
| tree | 66afe302b8efddeef9f8a787ab8c97f1e7d74102 /compiler/rustc_codegen_gcc/example/alloc_example.rs | |
| parent | f6830a212973ced91a047cee86cb79cee4f23868 (diff) | |
| parent | 2d72abc8f24d0af3b0344cbee14130eaaf90f75f (diff) | |
| download | rust-ed3ddb375bf18099a885605efba94dc1e50379d7.tar.gz rust-ed3ddb375bf18099a885605efba94dc1e50379d7.zip | |
Auto merge of #110789 - matthiaskrgr:rollup-92e764u, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #110563 (Break up long function in trait selection error reporting + clean up nearby code)
- #110755 ([LLVM17] Adapt to `ExplicitEmulatedTLS` removal.)
- #110775 (Update books)
- #110779 (configure.py: add flag for riscv{64,32}gc musl-root)
- #110782 (Revert panic oom)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
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 {} |
