Skip to content

Commit f920a16

Browse files
committed
Auto merge of #99574 - durin42:allocator-patch-redux, r=nikic
codegen: use new {re,de,}allocator annotations in llvm This obviates the patch that teaches LLVM internals about _rust_{re,de}alloc functions by putting annotations directly in the IR for the optimizer. The sole test change is required to anchor FileCheck to the body of the `box_uninitialized` method, so it doesn't see the `allocalign` on `__rust_alloc` and get mad about the string `alloca` showing up. Since I was there anyway, I added some checks on the attributes to prove the right attributes got set. r? `@nikic`
2 parents f094688 + 4337d10 commit f920a16

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

alloc/src/alloc.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,18 @@ extern "Rust" {
2525
// (the code expanding that attribute macro generates those functions), or to call
2626
// the default implementations in libstd (`__rdl_alloc` etc. in `library/std/src/alloc.rs`)
2727
// otherwise.
28-
// The rustc fork of LLVM also special-cases these function names to be able to optimize them
28+
// The rustc fork of LLVM 14 and earlier also special-cases these function names to be able to optimize them
2929
// like `malloc`, `realloc`, and `free`, respectively.
3030
#[rustc_allocator]
3131
#[rustc_allocator_nounwind]
3232
fn __rust_alloc(size: usize, align: usize) -> *mut u8;
33+
#[cfg_attr(not(bootstrap), rustc_deallocator)]
3334
#[rustc_allocator_nounwind]
3435
fn __rust_dealloc(ptr: *mut u8, size: usize, align: usize);
36+
#[cfg_attr(not(bootstrap), rustc_reallocator)]
3537
#[rustc_allocator_nounwind]
3638
fn __rust_realloc(ptr: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8;
39+
#[cfg_attr(not(bootstrap), rustc_allocator_zeroed)]
3740
#[rustc_allocator_nounwind]
3841
fn __rust_alloc_zeroed(size: usize, align: usize) -> *mut u8;
3942
}

0 commit comments

Comments
 (0)