diff options
| author | Ralf Jung <post@ralfj.de> | 2025-04-25 10:43:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-25 10:43:50 +0000 |
| commit | ea9037e1654d2fb7e29dca87679d3c18a713f82d (patch) | |
| tree | b304db669fcd8cadd9f7d0e3119e54545326318a /compiler/rustc_codegen_llvm/src/builder.rs | |
| parent | 0ee8f32dcd42a5091579f11db87f86672971a1d1 (diff) | |
| parent | 673c879abb7f3b05e25f0da5654e2a484abc17c0 (diff) | |
| download | rust-ea9037e1654d2fb7e29dca87679d3c18a713f82d.tar.gz rust-ea9037e1654d2fb7e29dca87679d3c18a713f82d.zip | |
Merge pull request #4292 from rust-lang/rustup-2025-04-25
Automatic Rustup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/builder.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/builder.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs index 27f7f95f100..04c8118b616 100644 --- a/compiler/rustc_codegen_llvm/src/builder.rs +++ b/compiler/rustc_codegen_llvm/src/builder.rs @@ -594,6 +594,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> { fn load(&mut self, ty: &'ll Type, ptr: &'ll Value, align: Align) -> &'ll Value { unsafe { let load = llvm::LLVMBuildLoad2(self.llbuilder, ty, ptr, UNNAMED); + let align = align.min(self.cx().tcx.sess.target.max_reliable_alignment()); llvm::LLVMSetAlignment(load, align.bytes() as c_uint); load } @@ -807,6 +808,7 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> { assert_eq!(self.cx.type_kind(self.cx.val_ty(ptr)), TypeKind::Pointer); unsafe { let store = llvm::LLVMBuildStore(self.llbuilder, val, ptr); + let align = align.min(self.cx().tcx.sess.target.max_reliable_alignment()); let align = if flags.contains(MemFlags::UNALIGNED) { 1 } else { align.bytes() as c_uint }; llvm::LLVMSetAlignment(store, align); |