bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

dont expect normalization to succeed in elaborate_drops

Browse source
This commit is contained in:
b-naber 2023-04-28 07:17:19 +00:00
parent c14882f74e
commit 930c39aa8f
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_mir_dataflow/src/elaborate_drops.rs
View file

@ -272,10 +272,16 @@ where
let field = FieldIdx::new(i); let field = FieldIdx::new(i);
let subpath = self.elaborator.field_subpath(variant_path, field); let subpath = self.elaborator.field_subpath(variant_path, field);
let tcx = self.tcx(); let tcx = self.tcx();
assert_eq!(self.elaborator.param_env().reveal(), Reveal::All); assert_eq!(self.elaborator.param_env().reveal(), Reveal::All);
let field_ty =
tcx.normalize_erasing_regions(self.elaborator.param_env(), f.ty(tcx, substs)); let fty = f.ty(tcx, substs);
let field_ty = match tcx
.try_normalize_erasing_regions(self.elaborator.param_env(), f.ty(tcx, substs))
{
Ok(f_ty) => f_ty,
Err(_) => fty,
};
(tcx.mk_place_field(base_place, field, field_ty), subpath) (tcx.mk_place_field(base_place, field, field_ty), subpath)
}) })
.collect() .collect()