user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #150116 - moulins:layout-inv-memory-index, r=workingjubilee

Browse source 
layout: Store inverse memory index in `FieldsShape::Arbitrary`

All usages of `memory_index` start by calling `invert_bijective_mapping`, so storing the inverted mapping directly saves some work and simplifies the code.
This commit is contained in:
Matthias Krüger 2025-12-19 23:38:59 +01:00 • committed by GitHub
commit 22440fd686
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
40 changed files with 254 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

46
compiler/rustc_abi/src/layout.rs
View file

@ -714,7 +714,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
},
fields: FieldsShape::Arbitrary {
offsets: [niche_offset].into(),
memory_index: [0].into(),
in_memory_order: [FieldIdx::new(0)].into(),
},
backend_repr: abi,
largest_niche,
@ -1008,8 +1008,8 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
let pair =
LayoutData::<FieldIdx, VariantIdx>::scalar_pair(&self.cx, tag, prim_scalar);
let pair_offsets = match pair.fields {
FieldsShape::Arbitrary { ref offsets, ref memory_index } => {
assert_eq!(memory_index.raw, [0, 1]);
FieldsShape::Arbitrary { ref offsets, ref in_memory_order } => {
assert_eq!(in_memory_order.raw, [FieldIdx::new(0), FieldIdx::new(1)]);
offsets
}
_ => panic!("encountered a non-arbitrary layout during enum layout"),
@ -1061,7 +1061,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
},
fields: FieldsShape::Arbitrary {
offsets: [Size::ZERO].into(),
memory_index: [0].into(),
in_memory_order: [FieldIdx::new(0)].into(),
},
largest_niche,
uninhabited,
@ -1110,10 +1110,10 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
let pack = repr.pack;
let mut align = if pack.is_some() { dl.i8_align } else { dl.aggregate_align };
let mut max_repr_align = repr.align;
let mut inverse_memory_index: IndexVec<u32, FieldIdx> = fields.indices().collect();
let mut in_memory_order: IndexVec<u32, FieldIdx> = fields.indices().collect();
let optimize_field_order = !repr.inhibit_struct_field_reordering();
let end = if let StructKind::MaybeUnsized = kind { fields.len() - 1 } else { fields.len() };
let optimizing = &mut inverse_memory_index.raw[..end];
let optimizing = &mut in_memory_order.raw[..end];
let fields_excluding_tail = &fields.raw[..end];
// unsizable tail fields are excluded so that we use the same seed for the sized and unsized layouts.
let field_seed = fields_excluding_tail
@ -1248,12 +1248,10 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
// regardless of the status of `-Z randomize-layout`
}
}
// inverse_memory_index holds field indices by increasing memory offset.
// That is, if field 5 has offset 0, the first element of inverse_memory_index is 5.
// in_memory_order holds field indices by increasing memory offset.
// That is, if field 5 has offset 0, the first element of in_memory_order is 5.
// We now write field offsets to the corresponding offset slot;
// field 5 with offset 0 puts 0 in offsets[5].
// At the bottom of this function, we invert `inverse_memory_index` to
// produce `memory_index` (see `invert_mapping`).
let mut unsized_field = None::<&F>;
let mut offsets = IndexVec::from_elem(Size::ZERO, fields);
let mut offset = Size::ZERO;
@ -1265,7 +1263,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
align = align.max(prefix_align);
offset = prefix_size.align_to(prefix_align);
}
for &i in &inverse_memory_index {
for &i in &in_memory_order {
let field = &fields[i];
if let Some(unsized_field) = unsized_field {
return Err(LayoutCalculatorError::UnexpectedUnsized(*unsized_field));
@ -1322,18 +1320,6 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
debug!("univariant min_size: {:?}", offset);
let min_size = offset;
// As stated above, inverse_memory_index holds field indices by increasing offset.
// This makes it an already-sorted view of the offsets vec.
// To invert it, consider:
// If field 5 has offset 0, offsets[0] is 5, and memory_index[5] should be 0.
// Field 5 would be the first element, so memory_index is i:
// Note: if we didn't optimize, it's already right.
let memory_index = if optimize_field_order {
inverse_memory_index.invert_bijective_mapping()
} else {
debug_assert!(inverse_memory_index.iter().copied().eq(fields.indices()));
inverse_memory_index.into_iter().map(|it| it.index() as u32).collect()
};
let size = min_size.align_to(align);
// FIXME(oli-obk): deduplicate and harden these checks
if size.bytes() >= dl.obj_size_bound() {
@ -1389,8 +1375,11 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
let pair =
LayoutData::<FieldIdx, VariantIdx>::scalar_pair(&self.cx, a, b);
let pair_offsets = match pair.fields {
FieldsShape::Arbitrary { ref offsets, ref memory_index } => {
assert_eq!(memory_index.raw, [0, 1]);
FieldsShape::Arbitrary { ref offsets, ref in_memory_order } => {
assert_eq!(
in_memory_order.raw,
[FieldIdx::new(0), FieldIdx::new(1)]
);
offsets
}
FieldsShape::Primitive
@ -1434,7 +1423,7 @@ impl<Cx: HasDataLayout> LayoutCalculator<Cx> {
Ok(LayoutData {
variants: Variants::Single { index: VariantIdx::new(0) },
fields: FieldsShape::Arbitrary { offsets, memory_index },
fields: FieldsShape::Arbitrary { offsets, in_memory_order },
backend_repr: abi,
largest_niche,
uninhabited,
@ -1530,7 +1519,10 @@ where
Ok(LayoutData {
variants: Variants::Single { index: VariantIdx::new(0) },
fields: FieldsShape::Arbitrary { offsets: [Size::ZERO].into(), memory_index: [0].into() },
fields: FieldsShape::Arbitrary {
offsets: [Size::ZERO].into(),
in_memory_order: [FieldIdx::new(0)].into(),
},
backend_repr: repr,
largest_niche: elt.largest_niche,
uninhabited: false,

46
compiler/rustc_abi/src/layout/coroutine.rs
View file

@ -182,33 +182,29 @@ pub(super) fn layout<
// CoroutineLayout.
debug!("prefix = {:#?}", prefix);
let (outer_fields, promoted_offsets, promoted_memory_index) = match prefix.fields {
FieldsShape::Arbitrary { mut offsets, memory_index } => {
let mut inverse_memory_index = memory_index.invert_bijective_mapping();
FieldsShape::Arbitrary { mut offsets, in_memory_order } => {
// "a" (`0..b_start`) and "b" (`b_start..`) correspond to
// "outer" and "promoted" fields respectively.
let b_start = tag_index.plus(1);
let offsets_b = IndexVec::from_raw(offsets.raw.split_off(b_start.index()));
let offsets_a = offsets;
// Disentangle the "a" and "b" components of `inverse_memory_index`
// Disentangle the "a" and "b" components of `in_memory_order`
// by preserving the order but keeping only one disjoint "half" each.
// FIXME(eddyb) build a better abstraction for permutations, if possible.
let inverse_memory_index_b: IndexVec<u32, FieldIdx> = inverse_memory_index
.iter()
.filter_map(|&i| i.index().checked_sub(b_start.index()).map(FieldIdx::new))
.collect();
inverse_memory_index.raw.retain(|&i| i.index() < b_start.index());
let inverse_memory_index_a = inverse_memory_index;
// Since `inverse_memory_index_{a,b}` each only refer to their
// respective fields, they can be safely inverted
let memory_index_a = inverse_memory_index_a.invert_bijective_mapping();
let memory_index_b = inverse_memory_index_b.invert_bijective_mapping();
let mut in_memory_order_a = IndexVec::<u32, FieldIdx>::new();
let mut in_memory_order_b = IndexVec::<u32, FieldIdx>::new();
for i in in_memory_order {
if let Some(j) = i.index().checked_sub(b_start.index()) {
in_memory_order_b.push(FieldIdx::new(j));
} else {
in_memory_order_a.push(i);
}
}
let outer_fields =
FieldsShape::Arbitrary { offsets: offsets_a, memory_index: memory_index_a };
(outer_fields, offsets_b, memory_index_b)
FieldsShape::Arbitrary { offsets: offsets_a, in_memory_order: in_memory_order_a };
(outer_fields, offsets_b, in_memory_order_b.invert_bijective_mapping())
}
_ => unreachable!(),
};
@ -236,7 +232,7 @@ pub(super) fn layout<
)?;
variant.variants = Variants::Single { index };
let FieldsShape::Arbitrary { offsets, memory_index } = variant.fields else {
let FieldsShape::Arbitrary { offsets, in_memory_order } = variant.fields else {
unreachable!();
};
@ -249,8 +245,9 @@ pub(super) fn layout<
// promoted fields were being used, but leave the elements not in the
// subset as `invalid_field_idx`, which we can filter out later to
// obtain a valid (bijective) mapping.
let memory_index = in_memory_order.invert_bijective_mapping();
let invalid_field_idx = promoted_memory_index.len() + memory_index.len();
let mut combined_inverse_memory_index =
let mut combined_in_memory_order =
IndexVec::from_elem_n(FieldIdx::new(invalid_field_idx), invalid_field_idx);
let mut offsets_and_memory_index = iter::zip(offsets, memory_index);
@ -268,19 +265,18 @@ pub(super) fn layout<
(promoted_offsets[field_idx], promoted_memory_index[field_idx])
}
};
combined_inverse_memory_index[memory_index] = i;
combined_in_memory_order[memory_index] = i;
offset
})
.collect();
// Remove the unused slots and invert the mapping to obtain the
// combined `memory_index` (also see previous comment).
combined_inverse_memory_index.raw.retain(|&i| i.index() != invalid_field_idx);
let combined_memory_index = combined_inverse_memory_index.invert_bijective_mapping();
// Remove the unused slots to obtain the combined `in_memory_order`
// (also see previous comment).
combined_in_memory_order.raw.retain(|&i| i.index() != invalid_field_idx);
variant.fields = FieldsShape::Arbitrary {
offsets: combined_offsets,
memory_index: combined_memory_index,
in_memory_order: combined_in_memory_order,
};
size = size.max(variant.size);

6
compiler/rustc_abi/src/layout/simple.rs
View file

@ -16,7 +16,7 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
variants: Variants::Single { index: VariantIdx::new(0) },
fields: FieldsShape::Arbitrary {
offsets: IndexVec::new(),
memory_index: IndexVec::new(),
in_memory_order: IndexVec::new(),
},
backend_repr: BackendRepr::Memory { sized },
largest_niche: None,
@ -108,7 +108,7 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
variants: Variants::Single { index: VariantIdx::new(0) },
fields: FieldsShape::Arbitrary {
offsets: [Size::ZERO, b_offset].into(),
memory_index: [0, 1].into(),
in_memory_order: [FieldIdx::new(0), FieldIdx::new(1)].into(),
},
backend_repr: BackendRepr::ScalarPair(a, b),
largest_niche,
@ -133,7 +133,7 @@ impl<FieldIdx: Idx, VariantIdx: Idx> LayoutData<FieldIdx, VariantIdx> {
Some(fields) => FieldsShape::Union(fields),
None => FieldsShape::Arbitrary {
offsets: IndexVec::new(),
memory_index: IndexVec::new(),
in_memory_order: IndexVec::new(),
},
},
backend_repr: BackendRepr::Memory { sized: true },

47
compiler/rustc_abi/src/lib.rs
View file

@ -1636,19 +1636,14 @@ pub enum FieldsShape<FieldIdx: Idx> {
// FIXME(eddyb) use small vector optimization for the common case.
offsets: IndexVec<FieldIdx, Size>,
/// Maps source order field indices to memory order indices,
/// Maps memory order field indices to source order indices,
/// depending on how the fields were reordered (if at all).
/// This is a permutation, with both the source order and the
/// memory order using the same (0..n) index ranges.
///
/// Note that during computation of `memory_index`, sometimes
/// it is easier to operate on the inverse mapping (that is,
/// from memory order to source order), and that is usually
/// named `inverse_memory_index`.
///
// FIXME(eddyb) build a better abstraction for permutations, if possible.
// FIXME(camlorn) also consider small vector optimization here.
memory_index: IndexVec<FieldIdx, u32>,
in_memory_order: IndexVec<u32, FieldIdx>,
},
}
@ -1682,51 +1677,17 @@ impl<FieldIdx: Idx> FieldsShape<FieldIdx> {
}
}
#[inline]
pub fn memory_index(&self, i: usize) -> usize {
match *self {
FieldsShape::Primitive => {
unreachable!("FieldsShape::memory_index: `Primitive`s have no fields")
}
FieldsShape::Union(_) | FieldsShape::Array { .. } => i,
FieldsShape::Arbitrary { ref memory_index, .. } => {
memory_index[FieldIdx::new(i)].try_into().unwrap()
}
}
}
/// Gets source indices of the fields by increasing offsets.
#[inline]
pub fn index_by_increasing_offset(&self) -> impl ExactSizeIterator<Item = usize> {
let mut inverse_small = [0u8; 64];
let mut inverse_big = IndexVec::new();
let use_small = self.count() <= inverse_small.len();
// We have to write this logic twice in order to keep the array small.
if let FieldsShape::Arbitrary { ref memory_index, .. } = *self {
if use_small {
for (field_idx, &mem_idx) in memory_index.iter_enumerated() {
inverse_small[mem_idx as usize] = field_idx.index() as u8;
}
} else {
inverse_big = memory_index.invert_bijective_mapping();
}
}
// Primitives don't really have fields in the way that structs do,
// but having this return an empty iterator for them is unhelpful
// since that makes them look kinda like ZSTs, which they're not.
let pseudofield_count = if let FieldsShape::Primitive = self { 1 } else { self.count() };
(0..pseudofield_count).map(move |i| match *self {
(0..pseudofield_count).map(move |i| match self {
FieldsShape::Primitive | FieldsShape::Union(_) | FieldsShape::Array { .. } => i,
FieldsShape::Arbitrary { .. } => {
if use_small {
inverse_small[i] as usize
} else {
inverse_big[i as u32].index()
}
}
FieldsShape::Arbitrary { in_memory_order, .. } => in_memory_order[i as u32].index(),
})
}
}

4
compiler/rustc_codegen_cranelift/src/pretty_clif.rs
View file

@ -10,7 +10,7 @@
//! function u0:22(i64) -> i8, i8 system_v {
//! ; symbol _ZN97_$LT$example..IsNotEmpty$u20$as$u20$mini_core..FnOnce$LT$$LP$$RF$$RF$$u5b$u16$u5d$$C$$RP$$GT$$GT$9call_once17hd361e9f5c3d1c4deE
//! ; instance Instance { def: Item(DefId(0:42 ~ example[3895]::{impl#0}::call_once)), args: ['{erased}, '{erased}] }
//! ; abi FnAbi { args: [ArgAbi { layout: TyAndLayout { ty: IsNotEmpty, layout: Layout { size: Size(0 bytes), align: AbiAndPrefAlign { abi: Align(1 bytes), pref: Align(8 bytes) }, backend_repr: Memory { sized: true }, fields: Arbitrary { offsets: [], memory_index: [] }, largest_niche: None, uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(1 bytes), randomization_seed: 12266848898570219025 } }, mode: Ignore }, ArgAbi { layout: TyAndLayout { ty: &&[u16], layout: Layout { size: Size(8 bytes), align: AbiAndPrefAlign { abi: Align(8 bytes), pref: Align(8 bytes) }, backend_repr: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), fields: Primitive, largest_niche: Some(Niche { offset: Size(0 bytes), value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(8 bytes), randomization_seed: 281492156579847 } }, mode: Direct(ArgAttributes { regular: NonNull | NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: Some(Align(8 bytes)) }) }], ret: ArgAbi { layout: TyAndLayout { ty: (u8, u8), layout: Layout { size: Size(2 bytes), align: AbiAndPrefAlign { abi: Align(1 bytes), pref: Align(8 bytes) }, backend_repr: ScalarPair(Initialized { value: Int(I8, false), valid_range: 0..=255 }, Initialized { value: Int(I8, false), valid_range: 0..=255 }), fields: Arbitrary { offsets: [Size(0 bytes), Size(1 bytes)], memory_index: [0, 1] }, largest_niche: None, uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(1 bytes), randomization_seed: 71776127651151873 } }, mode: Pair(ArgAttributes { regular: NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: None }, ArgAttributes { regular: NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: None }) }, c_variadic: false, fixed_count: 1, conv: Rust, can_unwind: false }
//! ; abi FnAbi { args: [ArgAbi { layout: TyAndLayout { ty: IsNotEmpty, layout: Layout { size: Size(0 bytes), align: AbiAndPrefAlign { abi: Align(1 bytes), pref: Align(8 bytes) }, backend_repr: Memory { sized: true }, fields: Arbitrary { offsets: [], in_memory_order: [] }, largest_niche: None, uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(1 bytes), randomization_seed: 12266848898570219025 } }, mode: Ignore }, ArgAbi { layout: TyAndLayout { ty: &&[u16], layout: Layout { size: Size(8 bytes), align: AbiAndPrefAlign { abi: Align(8 bytes), pref: Align(8 bytes) }, backend_repr: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), fields: Primitive, largest_niche: Some(Niche { offset: Size(0 bytes), value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(8 bytes), randomization_seed: 281492156579847 } }, mode: Direct(ArgAttributes { regular: NonNull | NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: Some(Align(8 bytes)) }) }], ret: ArgAbi { layout: TyAndLayout { ty: (u8, u8), layout: Layout { size: Size(2 bytes), align: AbiAndPrefAlign { abi: Align(1 bytes), pref: Align(8 bytes) }, backend_repr: ScalarPair(Initialized { value: Int(I8, false), valid_range: 0..=255 }, Initialized { value: Int(I8, false), valid_range: 0..=255 }), fields: Arbitrary { offsets: [Size(0 bytes), Size(1 bytes)], in_memory_order: [0, 1] }, largest_niche: None, uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(1 bytes), randomization_seed: 71776127651151873 } }, mode: Pair(ArgAttributes { regular: NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: None }, ArgAttributes { regular: NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: None }) }, c_variadic: false, fixed_count: 1, conv: Rust, can_unwind: false }
//!
//! ; kind loc.idx param pass mode ty
//! ; ssa _0 (u8, u8) 2b 1 var=(0, 1)
@ -41,7 +41,7 @@
//! ;
//! ; _0 = <IsNotEmpty as mini_core::FnMut<(&&[u16],)>>::call_mut(move _3, copy _2)
//! v2 = stack_load.i64 ss0
//! ; abi: FnAbi { args: [ArgAbi { layout: TyAndLayout { ty: &mut IsNotEmpty, layout: Layout { size: Size(8 bytes), align: AbiAndPrefAlign { abi: Align(8 bytes), pref: Align(8 bytes) }, backend_repr: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), fields: Primitive, largest_niche: Some(Niche { offset: Size(0 bytes), value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(8 bytes), randomization_seed: 281492156579847 } }, mode: Direct(ArgAttributes { regular: NonNull | NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: Some(Align(1 bytes)) }) }, ArgAbi { layout: TyAndLayout { ty: &&[u16], layout: Layout { size: Size(8 bytes), align: AbiAndPrefAlign { abi: Align(8 bytes), pref: Align(8 bytes) }, backend_repr: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), fields: Primitive, largest_niche: Some(Niche { offset: Size(0 bytes), value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(8 bytes), randomization_seed: 281492156579847 } }, mode: Direct(ArgAttributes { regular: NonNull | NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: Some(Align(8 bytes)) }) }], ret: ArgAbi { layout: TyAndLayout { ty: (u8, u8), layout: Layout { size: Size(2 bytes), align: AbiAndPrefAlign { abi: Align(1 bytes), pref: Align(8 bytes) }, backend_repr: ScalarPair(Initialized { value: Int(I8, false), valid_range: 0..=255 }, Initialized { value: Int(I8, false), valid_range: 0..=255 }), fields: Arbitrary { offsets: [Size(0 bytes), Size(1 bytes)], memory_index: [0, 1] }, largest_niche: None, uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(1 bytes), randomization_seed: 71776127651151873 } }, mode: Pair(ArgAttributes { regular: NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: None }, ArgAttributes { regular: NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: None }) }, c_variadic: false, fixed_count: 1, conv: Rust, can_unwind: false }
//! ; abi: FnAbi { args: [ArgAbi { layout: TyAndLayout { ty: &mut IsNotEmpty, layout: Layout { size: Size(8 bytes), align: AbiAndPrefAlign { abi: Align(8 bytes), pref: Align(8 bytes) }, backend_repr: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), fields: Primitive, largest_niche: Some(Niche { offset: Size(0 bytes), value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(8 bytes), randomization_seed: 281492156579847 } }, mode: Direct(ArgAttributes { regular: NonNull | NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: Some(Align(1 bytes)) }) }, ArgAbi { layout: TyAndLayout { ty: &&[u16], layout: Layout { size: Size(8 bytes), align: AbiAndPrefAlign { abi: Align(8 bytes), pref: Align(8 bytes) }, backend_repr: Scalar(Initialized { value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), fields: Primitive, largest_niche: Some(Niche { offset: Size(0 bytes), value: Pointer(AddressSpace(0)), valid_range: 1..=18446744073709551615 }), uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(8 bytes), randomization_seed: 281492156579847 } }, mode: Direct(ArgAttributes { regular: NonNull | NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: Some(Align(8 bytes)) }) }], ret: ArgAbi { layout: TyAndLayout { ty: (u8, u8), layout: Layout { size: Size(2 bytes), align: AbiAndPrefAlign { abi: Align(1 bytes), pref: Align(8 bytes) }, backend_repr: ScalarPair(Initialized { value: Int(I8, false), valid_range: 0..=255 }, Initialized { value: Int(I8, false), valid_range: 0..=255 }), fields: Arbitrary { offsets: [Size(0 bytes), Size(1 bytes)], in_memory_order: [0, 1] }, largest_niche: None, uninhabited: false, variants: Single { index: 0 }, max_repr_align: None, unadjusted_abi_align: Align(1 bytes), randomization_seed: 71776127651151873 } }, mode: Pair(ArgAttributes { regular: NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: None }, ArgAttributes { regular: NoUndef, arg_ext: None, pointee_size: Size(0 bytes), pointee_align: None }) }, c_variadic: false, fixed_count: 1, conv: Rust, can_unwind: false }
//! v3, v4 = call fn0(v1, v2) ; v1 = 1
//! v5 -> v3
//! v6 -> v4

18
compiler/rustc_const_eval/src/interpret/visitor.rs
View file

@ -4,7 +4,7 @@
use std::num::NonZero;
use rustc_abi::{FieldIdx, FieldsShape, VariantIdx, Variants};
use rustc_index::IndexVec;
use rustc_index::{Idx as _, IndexVec};
use rustc_middle::mir::interpret::InterpResult;
use rustc_middle::ty::{self, Ty};
use tracing::trace;
@ -27,13 +27,15 @@ pub trait ValueVisitor<'tcx, M: Machine<'tcx>>: Sized {
/// This function provides the chance to reorder the order in which fields are visited for
/// `FieldsShape::Aggregate`.
///
/// The default means we iterate in source declaration order; alternatively this can do some
/// work with `memory_index` to iterate in memory order.
/// The default means we iterate in source declaration order; alternatively this can use
/// `in_memory_order` to iterate in memory order.
#[inline(always)]
fn aggregate_field_iter(
memory_index: &IndexVec<FieldIdx, u32>,
) -> impl Iterator<Item = FieldIdx> + 'static {
memory_index.indices()
in_memory_order: &IndexVec<u32, FieldIdx>,
) -> impl Iterator<Item = FieldIdx> {
// Allow the optimizer to elide the bounds checking when creating each index.
let _ = FieldIdx::new(in_memory_order.len());
(0..in_memory_order.len()).map(FieldIdx::new)
}
// Recursive actions, ready to be overloaded.
@ -168,8 +170,8 @@ pub trait ValueVisitor<'tcx, M: Machine<'tcx>>: Sized {
&FieldsShape::Union(fields) => {
self.visit_union(v, fields)?;
}
FieldsShape::Arbitrary { memory_index, .. } => {
for idx in Self::aggregate_field_iter(memory_index) {
FieldsShape::Arbitrary { in_memory_order, .. } => {
for idx in Self::aggregate_field_iter(in_memory_order) {
let field = self.ecx().project_field(v, idx)?;
self.visit_field(v, idx.as_usize(), &field)?;
}

3
compiler/rustc_index/src/slice.rs
View file

@ -181,9 +181,6 @@ impl<I: Idx, J: Idx> IndexSlice<I, J> {
/// Invert a bijective mapping, i.e. `invert(map)[y] = x` if `map[x] = y`,
/// assuming the values in `self` are a permutation of `0..self.len()`.
///
/// This is used to go between `memory_index` (source field order to memory order)
/// and `inverse_memory_index` (memory order to source field order).
/// See also `FieldsShape::Arbitrary::memory_index` for more details.
// FIXME(eddyb) build a better abstraction for permutations, if possible.
pub fn invert_bijective_mapping(&self) -> IndexVec<J, I> {
debug_assert_eq!(

5
compiler/rustc_transmute/src/layout/tree.rs
View file

@ -491,7 +491,7 @@ pub(crate) mod rustc {
) -> Result<Self, Err> {
// This constructor does not support non-`FieldsShape::Arbitrary`
// layouts.
let FieldsShape::Arbitrary { offsets, memory_index } = layout.fields() else {
let FieldsShape::Arbitrary { offsets, in_memory_order } = layout.fields() else {
return Err(Err::NotYetSupported);
};
@ -519,8 +519,7 @@ pub(crate) mod rustc {
}
// Append the fields, in memory order, to the layout.
let inverse_memory_index = memory_index.invert_bijective_mapping();
for &field_idx in inverse_memory_index.iter() {
for &field_idx in in_memory_order.iter() {
// Add interfield padding.
let padding_needed = offsets[field_idx] - size;
let padding = Self::padding(padding_needed.bytes_usize());

4
compiler/rustc_ty_utils/src/layout.rs
View file

@ -9,7 +9,7 @@ use rustc_abi::{
use rustc_hashes::Hash64;
use rustc_hir::attrs::AttributeKind;
use rustc_hir::find_attr;
use rustc_index::IndexVec;
use rustc_index::{Idx as _, IndexVec};
use rustc_middle::bug;
use rustc_middle::query::Providers;
use rustc_middle::traits::ObligationCause;
@ -374,7 +374,7 @@ fn layout_of_uncached<'tcx>(
// specifically care about pattern types will have to handle it.
layout.fields = FieldsShape::Arbitrary {
offsets: [Size::ZERO].into_iter().collect(),
memory_index: [0].into_iter().collect(),
in_memory_order: [FieldIdx::new(0)].into_iter().collect(),
};
tcx.mk_layout(layout)
}

7
src/tools/miri/src/helpers.rs
View file

@ -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`.

4
tests/ui/abi/c-zst.aarch64-darwin.stderr
View file

@ -13,7 +13,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -41,7 +41,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

4
tests/ui/abi/c-zst.powerpc-linux.stderr
View file

@ -13,7 +13,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -52,7 +52,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

4
tests/ui/abi/c-zst.s390x-linux.stderr
View file

@ -13,7 +13,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -52,7 +52,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

4
tests/ui/abi/c-zst.sparc64-linux.stderr
View file

@ -13,7 +13,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -52,7 +52,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

4
tests/ui/abi/c-zst.x86_64-linux.stderr
View file

@ -13,7 +13,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -41,7 +41,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

4
tests/ui/abi/c-zst.x86_64-pc-windows-gnu.stderr
View file

@ -13,7 +13,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -52,7 +52,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

20
tests/ui/abi/debug.generic.stderr
View file

@ -244,7 +244,7 @@ error: fn_abi_of(test_generic) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -328,7 +328,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -400,7 +400,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -479,7 +479,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -552,7 +552,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -629,7 +629,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -701,7 +701,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -779,7 +779,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -851,7 +851,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -962,7 +962,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

20
tests/ui/abi/debug.loongarch64.stderr
View file

@ -244,7 +244,7 @@ error: fn_abi_of(test_generic) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -328,7 +328,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -400,7 +400,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -479,7 +479,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -552,7 +552,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -629,7 +629,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -701,7 +701,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -779,7 +779,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -851,7 +851,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -962,7 +962,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

20
tests/ui/abi/debug.riscv64.stderr
View file

@ -244,7 +244,7 @@ error: fn_abi_of(test_generic) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -328,7 +328,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -400,7 +400,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -479,7 +479,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -552,7 +552,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -629,7 +629,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -701,7 +701,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -779,7 +779,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -851,7 +851,7 @@ error: ABIs are not compatible
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -962,7 +962,7 @@ error: fn_abi_of(assoc_test) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

8
tests/ui/abi/pass-indirectly-attr.stderr
View file

@ -24,7 +24,7 @@ error: fn_abi_of(extern_c) = FnAbi {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -65,7 +65,7 @@ error: fn_abi_of(extern_c) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -106,7 +106,7 @@ error: fn_abi_of(extern_rust) = FnAbi {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -165,7 +165,7 @@ error: fn_abi_of(extern_rust) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

4
tests/ui/abi/sysv64-zst.stderr
View file

@ -13,7 +13,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -41,7 +41,7 @@ error: fn_abi_of(pass_zst) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

4
tests/ui/c-variadic/pass-by-value-abi.aarch64.stderr
View file

@ -13,7 +13,7 @@ error: fn_abi_of(take_va_list) = FnAbi {
},
fields: Arbitrary {
offsets: $OFFSETS,
memory_index: $MEMORY_INDEX,
in_memory_order: $MEMORY_INDEX,
},
largest_niche: None,
uninhabited: false,
@ -52,7 +52,7 @@ error: fn_abi_of(take_va_list) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

2
tests/ui/c-variadic/pass-by-value-abi.rs
View file

@ -1,7 +1,7 @@
//@ check-fail
//@ normalize-stderr: "randomization_seed: \d+" -> "randomization_seed: $$SEED"
//@ normalize-stderr: "valid_range: 0\.\.=\d+" -> "valid_range: 0..=$$MAX"
//@ normalize-stderr: "memory_index: \[[^\]]+\]" -> "memory_index: $$MEMORY_INDEX"
//@ normalize-stderr: "in_memory_order: \[[^\]]+\]" -> "in_memory_order: $$MEMORY_INDEX"
//@ normalize-stderr: "offsets: \[[^\]]+\]" -> "offsets: $$OFFSETS"
//@ revisions: x86_64 aarch64 win
//@ compile-flags: -O

4
tests/ui/c-variadic/pass-by-value-abi.win.stderr
View file

@ -20,7 +20,7 @@ error: fn_abi_of(take_va_list) = FnAbi {
),
fields: Arbitrary {
offsets: $OFFSETS,
memory_index: $MEMORY_INDEX,
in_memory_order: $MEMORY_INDEX,
},
largest_niche: None,
uninhabited: false,
@ -55,7 +55,7 @@ error: fn_abi_of(take_va_list) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

12
tests/ui/c-variadic/pass-by-value-abi.x86_64.stderr
View file

@ -13,7 +13,7 @@ error: fn_abi_of(take_va_list) = FnAbi {
},
fields: Arbitrary {
offsets: $OFFSETS,
memory_index: $MEMORY_INDEX,
in_memory_order: $MEMORY_INDEX,
},
largest_niche: None,
uninhabited: false,
@ -52,7 +52,7 @@ error: fn_abi_of(take_va_list) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -91,7 +91,7 @@ error: fn_abi_of(take_va_list_sysv64) = FnAbi {
},
fields: Arbitrary {
offsets: $OFFSETS,
memory_index: $MEMORY_INDEX,
in_memory_order: $MEMORY_INDEX,
},
largest_niche: None,
uninhabited: false,
@ -130,7 +130,7 @@ error: fn_abi_of(take_va_list_sysv64) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -171,7 +171,7 @@ error: fn_abi_of(take_va_list_win64) = FnAbi {
},
fields: Arbitrary {
offsets: $OFFSETS,
memory_index: $MEMORY_INDEX,
in_memory_order: $MEMORY_INDEX,
},
largest_niche: None,
uninhabited: false,
@ -210,7 +210,7 @@ error: fn_abi_of(take_va_list_win64) = FnAbi {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

16
tests/ui/enum-discriminant/wrapping_niche.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(UnsignedAroundZero) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -52,7 +52,7 @@ error: layout_of(UnsignedAroundZero) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -73,7 +73,7 @@ error: layout_of(UnsignedAroundZero) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -94,7 +94,7 @@ error: layout_of(UnsignedAroundZero) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -134,7 +134,7 @@ error: layout_of(SignedAroundZero) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -170,7 +170,7 @@ error: layout_of(SignedAroundZero) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -191,7 +191,7 @@ error: layout_of(SignedAroundZero) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -212,7 +212,7 @@ error: layout_of(SignedAroundZero) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

14
tests/ui/layout/debug.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(E) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -52,7 +52,7 @@ error: layout_of(E) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -77,7 +77,7 @@ error: layout_of(E) = Layout {
Size(4 bytes),
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
1,
2,
@ -130,7 +130,7 @@ error: layout_of(S) = Layout {
Size(8 bytes),
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
2,
1,
@ -200,7 +200,7 @@ error: layout_of(Result<i32, i32>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -251,7 +251,7 @@ error: layout_of(Result<i32, i32>) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -289,7 +289,7 @@ error: layout_of(Result<i32, i32>) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},

20
tests/ui/layout/hexagon-enum.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(A) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -52,7 +52,7 @@ error: layout_of(A) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -92,7 +92,7 @@ error: layout_of(B) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -128,7 +128,7 @@ error: layout_of(B) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -168,7 +168,7 @@ error: layout_of(C) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -204,7 +204,7 @@ error: layout_of(C) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -244,7 +244,7 @@ error: layout_of(P) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -280,7 +280,7 @@ error: layout_of(P) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -320,7 +320,7 @@ error: layout_of(T) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -356,7 +356,7 @@ error: layout_of(T) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

34
tests/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
View file

@ -22,7 +22,7 @@ error: layout_of(MissingPayloadField) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -72,7 +72,7 @@ error: layout_of(MissingPayloadField) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -95,7 +95,7 @@ error: layout_of(MissingPayloadField) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -142,7 +142,7 @@ error: layout_of(CommonPayloadField) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -193,7 +193,7 @@ error: layout_of(CommonPayloadField) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -231,7 +231,7 @@ error: layout_of(CommonPayloadField) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -279,7 +279,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -329,7 +329,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -366,7 +366,7 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -414,7 +414,7 @@ error: layout_of(NicheFirst) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -470,7 +470,7 @@ error: layout_of(NicheFirst) = Layout {
Size(0 bytes),
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
1,
],
@ -503,7 +503,7 @@ error: layout_of(NicheFirst) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -524,7 +524,7 @@ error: layout_of(NicheFirst) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -570,7 +570,7 @@ error: layout_of(NicheSecond) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -626,7 +626,7 @@ error: layout_of(NicheSecond) = Layout {
Size(1 bytes),
Size(0 bytes),
],
memory_index: [
in_memory_order: [
1,
0,
],
@ -659,7 +659,7 @@ error: layout_of(NicheSecond) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -680,7 +680,7 @@ error: layout_of(NicheSecond) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

12
tests/ui/layout/issue-96185-overaligned-enum.stderr
View file

@ -10,7 +10,7 @@ error: layout_of(Aligned1) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -46,7 +46,7 @@ error: layout_of(Aligned1) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -69,7 +69,7 @@ error: layout_of(Aligned1) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -113,7 +113,7 @@ error: layout_of(Aligned2) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -149,7 +149,7 @@ error: layout_of(Aligned2) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -172,7 +172,7 @@ error: layout_of(Aligned2) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

20
tests/ui/layout/thumb-enum.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(A) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -52,7 +52,7 @@ error: layout_of(A) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -92,7 +92,7 @@ error: layout_of(B) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -128,7 +128,7 @@ error: layout_of(B) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -168,7 +168,7 @@ error: layout_of(C) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -204,7 +204,7 @@ error: layout_of(C) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -244,7 +244,7 @@ error: layout_of(P) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -280,7 +280,7 @@ error: layout_of(P) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -320,7 +320,7 @@ error: layout_of(T) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -356,7 +356,7 @@ error: layout_of(T) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,

26
tests/ui/layout/zero-sized-array-enum-niche.stderr
View file

@ -10,7 +10,7 @@ error: layout_of(Result<[u32; 0], bool>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -48,7 +48,7 @@ error: layout_of(Result<[u32; 0], bool>) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -73,7 +73,7 @@ error: layout_of(Result<[u32; 0], bool>) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -118,7 +118,7 @@ error: layout_of(MultipleAlignments) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -156,7 +156,7 @@ error: layout_of(MultipleAlignments) = Layout {
offsets: [
Size(2 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -181,7 +181,7 @@ error: layout_of(MultipleAlignments) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -206,7 +206,7 @@ error: layout_of(MultipleAlignments) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -251,7 +251,7 @@ error: layout_of(Result<[u32; 0], Packed<NonZero<u16>>>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -289,7 +289,7 @@ error: layout_of(Result<[u32; 0], Packed<NonZero<u16>>>) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -314,7 +314,7 @@ error: layout_of(Result<[u32; 0], Packed<NonZero<u16>>>) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -359,7 +359,7 @@ error: layout_of(Result<[u32; 0], Packed<U16IsZero>>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -401,7 +401,7 @@ error: layout_of(Result<[u32; 0], Packed<U16IsZero>>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -426,7 +426,7 @@ error: layout_of(Result<[u32; 0], Packed<U16IsZero>>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},

16
tests/ui/repr/repr-c-dead-variants.aarch64-unknown-linux-gnu.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(Univariant) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -60,7 +60,7 @@ error: layout_of(Univariant) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -108,7 +108,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -158,7 +158,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -195,7 +195,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -231,7 +231,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -270,7 +270,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
Size(8 bytes),
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
1,
],
@ -298,7 +298,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
offsets: [
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},

16
tests/ui/repr/repr-c-dead-variants.armebv7r-none-eabi.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(Univariant) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -60,7 +60,7 @@ error: layout_of(Univariant) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -108,7 +108,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -158,7 +158,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -195,7 +195,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -231,7 +231,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -270,7 +270,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
Size(8 bytes),
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
1,
],
@ -298,7 +298,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
offsets: [
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},

16
tests/ui/repr/repr-c-dead-variants.i686-pc-windows-msvc.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(Univariant) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -60,7 +60,7 @@ error: layout_of(Univariant) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -108,7 +108,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -158,7 +158,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -195,7 +195,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -231,7 +231,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -270,7 +270,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
Size(8 bytes),
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
1,
],
@ -298,7 +298,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
offsets: [
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},

16
tests/ui/repr/repr-c-dead-variants.x86_64-unknown-linux-gnu.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(Univariant) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -60,7 +60,7 @@ error: layout_of(Univariant) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -108,7 +108,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -158,7 +158,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -195,7 +195,7 @@ error: layout_of(TwoVariants) = Layout {
offsets: [
Size(4 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -231,7 +231,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -270,7 +270,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
Size(8 bytes),
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
1,
],
@ -298,7 +298,7 @@ error: layout_of(DeadBranchHasOtherField) = Layout {
offsets: [
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},

16
tests/ui/repr/repr-c-int-dead-variants.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(UnivariantU8) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -60,7 +60,7 @@ error: layout_of(UnivariantU8) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -108,7 +108,7 @@ error: layout_of(TwoVariantsU8) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -158,7 +158,7 @@ error: layout_of(TwoVariantsU8) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -195,7 +195,7 @@ error: layout_of(TwoVariantsU8) = Layout {
offsets: [
Size(1 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -231,7 +231,7 @@ error: layout_of(DeadBranchHasOtherFieldU8) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -270,7 +270,7 @@ error: layout_of(DeadBranchHasOtherFieldU8) = Layout {
Size(8 bytes),
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
1,
],
@ -298,7 +298,7 @@ error: layout_of(DeadBranchHasOtherFieldU8) = Layout {
offsets: [
Size(8 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},

10
tests/ui/type/pattern_types/non_null.stderr
View file

@ -17,7 +17,7 @@ error: layout_of((*const T) is !null) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -64,7 +64,7 @@ error: layout_of(Option<(*const ()) is !null>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -96,7 +96,7 @@ error: layout_of(Option<(*const ()) is !null>) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -126,7 +126,7 @@ error: layout_of(Option<(*const ()) is !null>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -186,7 +186,7 @@ error: layout_of((*const [u8]) is !null) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},

4
tests/ui/type/pattern_types/or_patterns.stderr
View file

@ -57,7 +57,7 @@ error: layout_of((i8) is (i8::MIN..=-1 | 1..)) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -102,7 +102,7 @@ error: layout_of((i8) is (i8::MIN..=-2 | 0..)) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},

22
tests/ui/type/pattern_types/range_patterns.stderr
View file

@ -16,7 +16,7 @@ error: layout_of(NonZero<u32>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -61,7 +61,7 @@ error: layout_of((u32) is 1..) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -106,7 +106,7 @@ error: layout_of(Option<(u32) is 1..>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -137,7 +137,7 @@ error: layout_of(Option<(u32) is 1..>) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -166,7 +166,7 @@ error: layout_of(Option<(u32) is 1..>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -217,7 +217,7 @@ error: layout_of(Option<NonZero<u32>>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -248,7 +248,7 @@ error: layout_of(Option<NonZero<u32>>) = Layout {
},
fields: Arbitrary {
offsets: [],
memory_index: [],
in_memory_order: [],
},
largest_niche: None,
uninhabited: false,
@ -277,7 +277,7 @@ error: layout_of(Option<NonZero<u32>>) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -328,7 +328,7 @@ error: layout_of(NonZeroU32New) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -401,7 +401,7 @@ error: layout_of((i8) is -10..=10) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},
@ -446,7 +446,7 @@ error: layout_of((i8) is i8::MIN..=0) = Layout {
offsets: [
Size(0 bytes),
],
memory_index: [
in_memory_order: [
0,
],
},