bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reorder to keep duplicate checks in sync.

Browse source
This commit is contained in:
Luqman Aden 2023-05-05 16:30:32 -07:00
parent 012f9a333b
commit 8e7714d3bb
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -744,12 +744,20 @@ pub trait LayoutCalculator {
for field in only_variant { for field in only_variant {
assert!(field.0.is_sized()); assert!(field.0.is_sized());
if !field.0.is_zst() && !common_non_zst_abi_and_align.is_err() { align = align.max(field.align());
size = cmp::max(size, field.size());
if field.0.is_zst() {
// Nothing more to do for ZST fields
continue;
}
if let Ok(common) = common_non_zst_abi_and_align {
// Discard valid range information and allow undef // Discard valid range information and allow undef
let field_abi = field.abi().to_union(); let field_abi = field.abi().to_union();
if let Ok(Some((common_abi, common_align))) = &mut common_non_zst_abi_and_align { if let Some((common_abi, common_align)) = common {
if *common_abi != field_abi { if common_abi != field_abi {
// Different fields have different ABI: disable opt // Different fields have different ABI: disable opt
common_non_zst_abi_and_align = Err(AbiMismatch); common_non_zst_abi_and_align = Err(AbiMismatch);
} else { } else {
@ -757,7 +765,7 @@ pub trait LayoutCalculator {
// have the same alignment // have the same alignment
if !matches!(common_abi, Abi::Aggregate { .. }) { if !matches!(common_abi, Abi::Aggregate { .. }) {
assert_eq!( assert_eq!(
*common_align, common_align,
field.align().abi, field.align().abi,
"non-Aggregate field with matching ABI but differing alignment" "non-Aggregate field with matching ABI but differing alignment"
); );
@ -768,9 +776,6 @@ pub trait LayoutCalculator {
common_non_zst_abi_and_align = Ok(Some((field_abi, field.align().abi))); common_non_zst_abi_and_align = Ok(Some((field_abi, field.align().abi)));
} }
} }
align = align.max(field.align());
size = cmp::max(size, field.size());
} }
if let Some(pack) = repr.pack { if let Some(pack) = repr.pack {