bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix for the issue #92464

Browse source
This commit is contained in:
ouz-a 2022-01-15 15:03:38 +03:00
parent 38c22af015
commit fd5be23a96
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_middle/src/ty/layout.rs
View file

@ -1310,7 +1310,10 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
},
};
let mut abi = Abi::Aggregate { sized: true };
if tag.value.size(dl) == size {
// Without latter check aligned enums with custom discriminant values
// Would result in ICE see the issue #92464 for more info
if tag.value.size(dl) == size || variants.iter().all(|layout| layout.is_empty()) {
abi = Abi::Scalar(tag);
} else {
// Try to use a ScalarPair for all tagged enums.