diff options
| author | bors <bors@rust-lang.org> | 2025-09-10 15:09:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-10 15:09:18 +0000 |
| commit | 565a9ca63e9df4b223fed0da01f15e578acfb538 (patch) | |
| tree | fdbc4245cfe17954d617a6f3c9b89c025ff128cb /compiler/rustc_codegen_llvm/src | |
| parent | 7ad23f43a225546c095123de52cc07d8719f8e2b (diff) | |
| parent | 212baec446dd7fc7bbda66a4b3b0e2f856d575ce (diff) | |
| download | rust-565a9ca63e9df4b223fed0da01f15e578acfb538.tar.gz rust-565a9ca63e9df4b223fed0da01f15e578acfb538.zip | |
Auto merge of #146409 - matthiaskrgr:rollup-thju381, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - rust-lang/rust#144765 (inclusive `Range`s: change `end` to `last`) - rust-lang/rust#146178 (Implement `#[rustc_align_static(N)]` on `static`s) - rust-lang/rust#146368 (CI: rfl: move job forward to Linux v6.17-rc5 to remove temporary commits) - rust-lang/rust#146378 (Update wasm-component-ld to 0.5.17) - rust-lang/rust#146391 (Trim paths less in MIR dumping) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/consts.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/consts.rs b/compiler/rustc_codegen_llvm/src/consts.rs index 9ec7b0f80ae..dc9bb743560 100644 --- a/compiler/rustc_codegen_llvm/src/consts.rs +++ b/compiler/rustc_codegen_llvm/src/consts.rs @@ -452,6 +452,8 @@ impl<'ll> CodegenCx<'ll, '_> { self.statics_to_rauw.borrow_mut().push((g, new_g)); new_g }; + + // NOTE: Alignment from attributes has already been applied to the allocation. set_global_alignment(self, g, alloc.align); llvm::set_initializer(g, v); |