Merge ref '29b7717de23f' from rust-lang/rust

The Miri Cronjob Bot · The Miri Cronjob Bot · commit 4ab1cf7105e3 · 2025-09-30T05:01:17.000Z
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: 29b7717de23f3969ceeb5bef5b01d9223f807655 Filtered ref: fb4b638 Upstream diff: rust-lang/rust@f957826...29b7717 This merge was created using https://github.com/rust-lang/josh-sync.
diff --git a/src/machine.rs b/src/machine.rs
@@ -1340,7 +1340,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
`@@ -1340,7 +1340,7 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {`
`1340`	`1340`	`name = ecx.tcx.def_path_str(def_id),`
`1341`	`1341`	`krate = ecx.tcx.crate_name(def_id.krate),`
`1342`	`1342`	`decl_size = extern_decl_layout.size.bytes(),`
`1343`		`- decl_align = extern_decl_layout.align.abi.bytes(),`
	`1343`	`+ decl_align = extern_decl_layout.align.bytes(),`
`1344`	`1344`	`shim_size = info.size.bytes(),`
`1345`	`1345`	`shim_align = info.align.bytes(),`
`1346`	`1346`	`)`