Auto merge of #150177 - matthiaskrgr:rollup-4cw3gdw, r=matthiaskrgr

bors · bors · commit 49080e31122a · 2025-12-20T05:17:27.000Z
Rollup of 6 pull requests Successful merges: - rust-lang/rust#149633 (Enable `outline-atomics` by default on AArch64 FreeBSD) - rust-lang/rust#149788 (Move shared offload globals and define per-kernel globals once) - rust-lang/rust#149989 (Improve filenames encoding and misc) - rust-lang/rust#150012 (rustc_target: Add `efiapi` ABI support for LoongArch) - rust-lang/rust#150116 (layout: Store inverse memory index in `FieldsShape::Arbitrary`) - rust-lang/rust#150159 (Split eii macro expansion code) r? `@ghost` `@rustbot` modify labels: rollup
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -584,10 +584,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             }
 
             fn aggregate_field_iter(
-                memory_index: &IndexVec<FieldIdx, u32>,
-            ) -> impl Iterator<Item = FieldIdx> + 'static {
-                let inverse_memory_index = memory_index.invert_bijective_mapping();
-                inverse_memory_index.into_iter()
+                in_memory_order: &IndexVec<u32, FieldIdx>,
+            ) -> impl Iterator<Item = FieldIdx> {
+                in_memory_order.iter().copied()
             }
 
             // Hook to detect `UnsafeCell`.

Original file line number	Diff line number	Diff line change
`@@ -584,10 +584,9 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`584`	`584`	`}`
`585`	`585`
`586`	`586`	`fn aggregate_field_iter(`
`587`		`- memory_index: &IndexVec<FieldIdx, u32>,`
`588`		`- ) -> impl Iterator<Item = FieldIdx> + 'static {`
`589`		`- let inverse_memory_index = memory_index.invert_bijective_mapping();`
`590`		`- inverse_memory_index.into_iter()`
	`587`	`+ in_memory_order: &IndexVec<u32, FieldIdx>,`
	`588`	`+ ) -> impl Iterator<Item = FieldIdx> {`
	`589`	`+ in_memory_order.iter().copied()`
`591`	`590`	`}`
`592`	`591`
`593`	`592`	// Hook to detect `UnsafeCell`.