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

Fix for #62691: use the largest niche across all fields

Browse source 
fixes #62691
This commit is contained in:
Olivier Goffart 2020-03-25 22:42:13 +01:00
parent 02046a5d40
commit 4d77d01096
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/librustc/ty/layout.rs
View file

@ -282,8 +282,6 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
let mut align = if pack.is_some() { dl.i8_align } else { dl.aggregate_align };
let mut sized = true;
let mut offsets = vec![Size::ZERO; fields.len()];
let mut inverse_memory_index: Vec<u32> = (0..fields.len() as u32).collect();
let mut optimize = !repr.inhibit_struct_field_reordering_opt();
@ -320,6 +318,8 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
// At the bottom of this function, we invert `inverse_memory_index` to
// produce `memory_index` (see `invert_mapping`).
let mut sized = true;
let mut offsets = vec![Size::ZERO; fields.len()];
let mut offset = Size::ZERO;
let mut largest_niche = None;
let mut largest_niche_available = 0;
@ -907,18 +907,15 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
let count = (niche_variants.end().as_u32()
- niche_variants.start().as_u32()
+ 1) as u128;
// FIXME(#62691) use the largest niche across all fields,
// not just the first one.
for (field_index, &field) in variants[i].iter().enumerate() {
let niche = match &field.largest_niche {
Some(niche) => niche,
_ => continue,
};
let (niche_start, niche_scalar) = match niche.reserve(self, count) {
Some(pair) => pair,
None => continue,
};
if let Some((field_index, niche, (niche_start, niche_scalar))) = variants[i]
.iter()
.enumerate()
.filter_map(|(i, &field)| {
let niche = field.largest_niche.as_ref()?;
Some((i, niche, niche.reserve(self, count)?))
})
.max_by_key(|(_, niche, _)| niche.available(dl))
{
let mut align = dl.aggregate_align;
let st = variants
.iter_enumerated()

7
src/test/ui/type-sizes.rs
View file

@ -74,6 +74,11 @@ enum NicheFilledEnumWithAbsentVariant {
C,
}
enum Option2<A, B> {
Some(A, B),
None
}
pub fn main() {
assert_eq!(size_of::<u8>(), 1 as usize);
assert_eq!(size_of::<u32>(), 4 as usize);
@ -113,4 +118,6 @@ pub fn main() {
assert_eq!(size_of::<Option<Option<(bool, &())>>>(), size_of::<(bool, &())>());
assert_eq!(size_of::<Option<Option<(&(), bool)>>>(), size_of::<(bool, &())>());
assert_eq!(size_of::<Option<Option2<bool, &()>>>(), size_of::<(bool, &())>());
assert_eq!(size_of::<Option<Option2<&(), bool>>>(), size_of::<(bool, &())>());
}