diff options
| author | bors <bors@rust-lang.org> | 2022-07-26 19:35:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-26 19:35:57 +0000 |
| commit | 4d6d601c8a83284d6b23c253a3e2a060fd197316 (patch) | |
| tree | b50b4e041cade7275160c65fe71a50ae346b6830 /compiler/rustc_span | |
| parent | c11207ec89b856164bba03b8ecfe07b0b234ed21 (diff) | |
| parent | 130a1df71ea73ab9d66d3cb8fc9cdb43155d514b (diff) | |
| download | rust-4d6d601c8a83284d6b23c253a3e2a060fd197316.tar.gz rust-4d6d601c8a83284d6b23c253a3e2a060fd197316.zip | |
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`
Diffstat (limited to 'compiler/rustc_span')
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index 54d67c52541..c75b6772487 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -1202,6 +1202,7 @@ symbols! { rustc, rustc_allocator, rustc_allocator_nounwind, + rustc_allocator_zeroed, rustc_allow_const_fn_unstable, rustc_allow_incoherent_impl, rustc_allowed_through_unstable_modules, @@ -1214,6 +1215,7 @@ symbols! { rustc_const_stable, rustc_const_unstable, rustc_conversion_suggestion, + rustc_deallocator, rustc_def_path, rustc_diagnostic_item, rustc_diagnostic_macros, @@ -1258,6 +1260,7 @@ symbols! { rustc_private, rustc_proc_macro_decls, rustc_promotable, + rustc_reallocator, rustc_regions, rustc_reservation_impl, rustc_serialize, |