Auto merge of #146409 - matthiaskrgr:rollup-thju381, r=matthiaskrgr

bors · bors · commit d2d615c8bc84 · 2025-09-10T15:09:18.000Z
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
diff --git a/src/consts.rs b/src/consts.rs
@@ -81,6 +81,8 @@ impl<'gcc, 'tcx> StaticCodegenMethods for CodegenCx<'gcc, 'tcx> {
         if global.to_rvalue().get_type() != val_llty {
             global.to_rvalue().set_type(val_llty);
         }
+
+        // NOTE: Alignment from attributes has already been applied to the allocation.
         set_global_alignment(self, global, alloc.align);
 
         global.global_set_initializer_rvalue(value);

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ impl<'gcc, 'tcx> StaticCodegenMethods for CodegenCx<'gcc, 'tcx> {`
`81`	`81`	`if global.to_rvalue().get_type() != val_llty {`
`82`	`82`	`global.to_rvalue().set_type(val_llty);`
`83`	`83`	`}`
	`84`	`+`
	`85`	`+ // NOTE: Alignment from attributes has already been applied to the allocation.`
`84`	`86`	`set_global_alignment(self, global, alloc.align);`
`85`	`87`
`86`	`88`	`global.global_set_initializer_rvalue(value);`