bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Handle normalization failure in struct_tail_erasing_lifetimes

Browse source 
Fixes an ICE that occurred when the struct in question has an error
This commit is contained in:
Gurinder Singh 2024-05-01 09:29:33 +05:30
parent 90846015cc
commit 0c71c9d74b
3 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -332,7 +332,22 @@ impl<'tcx> SizeSkeleton<'tcx> {
match *ty.kind() {
ty::Ref(_, pointee, _) | ty::RawPtr(pointee, _) => {
let non_zero = !ty.is_unsafe_ptr();
let tail = tcx.struct_tail_erasing_lifetimes(pointee, param_env);
let tail = tcx.struct_tail_with_normalize(
pointee,
|ty| match tcx.try_normalize_erasing_regions(param_env, ty) {
Ok(ty) => ty,
Err(_e) => {
if let Some(guar) = tcx.dcx().has_errors() {
Ty::new_error(tcx, guar)
} else {
bug!("normalization failed, but no errors reported");
}
}
},
|| {},
);
match tail.kind() {
ty::Param(_) | ty::Alias(ty::Projection | ty::Inherent, _) => {
debug_assert!(tail.has_non_region_param());