diff options
| author | bors <bors@rust-lang.org> | 2025-09-29 08:43:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-29 08:43:49 +0000 |
| commit | 128b36a4a48534b048845cc744b9672529d13df1 (patch) | |
| tree | 1865fff489a995052f27f86e59960d24426dfa9f /compiler/rustc_codegen_cranelift/src/base.rs | |
| parent | 7af913fc90968844286e5ff6675ab66afa98cdc6 (diff) | |
| parent | cd6f32a4eb6b53e7df0882bc396c1c36cf4736ca (diff) | |
| download | rust-128b36a4a48534b048845cc744b9672529d13df1.tar.gz rust-128b36a4a48534b048845cc744b9672529d13df1.zip | |
Auto merge of #147145 - Zalathar:rollup-s7kcs3w, r=Zalathar
Rollup of 3 pull requests Successful merges: - rust-lang/rust#147100 (tests: Remove ignore-android directive for fixed issue) - rust-lang/rust#147116 (compiler: remove AbiAlign inside TargetDataLayout) - rust-lang/rust#147134 (remove explicit deref of AbiAlign for most methods) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_cranelift/src/base.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/src/base.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_cranelift/src/base.rs b/compiler/rustc_codegen_cranelift/src/base.rs index 41e11e1de61..2cc5b82ddd3 100644 --- a/compiler/rustc_codegen_cranelift/src/base.rs +++ b/compiler/rustc_codegen_cranelift/src/base.rs @@ -846,7 +846,7 @@ fn codegen_stmt<'tcx>(fx: &mut FunctionCx<'_, '_, 'tcx>, cur_block: Block, stmt: let layout = fx.layout_of(fx.monomorphize(ty)); let val = match null_op { NullOp::SizeOf => layout.size.bytes(), - NullOp::AlignOf => layout.align.abi.bytes(), + NullOp::AlignOf => layout.align.bytes(), NullOp::OffsetOf(fields) => fx .tcx .offset_of_subfield( |