bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Erase lifetimes in SROA.

Browse source
This commit is contained in:
Camille GILLOT 2023-03-05 18:13:43 +00:00
parent 248a5301af
commit fc1a861558
4 changed files with 272 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir_dataflow/src/value_analysis.rs
View file

@ -690,7 +690,7 @@ impl Map {
}
// Recurse with all fields of this place.
iter_fields(ty, tcx, |variant, field, ty| {
iter_fields(ty, tcx, ty::ParamEnv::reveal_all(), |variant, field, ty| {
if let Some(variant) = variant {
projection.push(PlaceElem::Downcast(None, variant));
let _ = self.make_place(local, projection);
@ -939,6 +939,7 @@ impl<V, T> TryFrom<ProjectionElem<V, T>> for TrackElem {
pub fn iter_fields<'tcx>(
ty: Ty<'tcx>,
tcx: TyCtxt<'tcx>,
param_env: ty::ParamEnv<'tcx>,
mut f: impl FnMut(Option<VariantIdx>, Field, Ty<'tcx>),
) {
match ty.kind() {
@ -956,14 +957,14 @@ pub fn iter_fields<'tcx>(
for (f_index, f_def) in v_def.fields.iter().enumerate() {
let field_ty = f_def.ty(tcx, substs);
let field_ty = tcx
.try_normalize_erasing_regions(ty::ParamEnv::reveal_all(), field_ty)
.unwrap_or(field_ty);
.try_normalize_erasing_regions(param_env, field_ty)
.unwrap_or_else(|_| tcx.erase_regions(field_ty));
f(variant, f_index.into(), field_ty);
}
}
}
ty::Closure(_, substs) => {
iter_fields(substs.as_closure().tupled_upvars_ty(), tcx, f);
iter_fields(substs.as_closure().tupled_upvars_ty(), tcx, param_env, f);
}
_ => (),
}