Auto merge of #147145 - Zalathar:rollup-s7kcs3w, r=Zalathar

bors · bors · commit 3507b03df1ee · 2025-09-29T08:43:49.000Z
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
diff --git a/src/machine.rs b/src/machine.rs
@@ -1341,7 +1341,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
                     name = ecx.tcx.def_path_str(def_id),
                     krate = ecx.tcx.crate_name(def_id.krate),
                     decl_size = extern_decl_layout.size.bytes(),
-                    decl_align = extern_decl_layout.align.abi.bytes(),
+                    decl_align = extern_decl_layout.align.bytes(),
                     shim_size = info.size.bytes(),
                     shim_align = info.align.bytes(),
                 )

Original file line number	Diff line number	Diff line change
`@@ -1341,7 +1341,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {`
`1341`	`1341`	`name = ecx.tcx.def_path_str(def_id),`
`1342`	`1342`	`krate = ecx.tcx.crate_name(def_id.krate),`
`1343`	`1343`	`decl_size = extern_decl_layout.size.bytes(),`
`1344`		`- decl_align = extern_decl_layout.align.abi.bytes(),`
	`1344`	`+ decl_align = extern_decl_layout.align.bytes(),`
`1345`	`1345`	`shim_size = info.size.bytes(),`
`1346`	`1346`	`shim_align = info.align.bytes(),`
`1347`	`1347`	`)`