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

Drop relate_opaque_item_substs.

Browse source
This commit is contained in:
Camille GILLOT 2022-11-14 18:05:14 +00:00
parent c5949c8bee
commit d470ac9334
2 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_infer/src/infer/combine.rs
View file

@ -563,6 +563,7 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
&opt_variances, &opt_variances,
a_subst, a_subst,
b_subst, b_subst,
true,
) )
} }
} }

35
compiler/rustc_middle/src/ty/relate.rs
View file

@ -60,7 +60,7 @@ pub trait TypeRelation<'tcx>: Sized {
let tcx = self.tcx(); let tcx = self.tcx();
let opt_variances = tcx.variances_of(item_def_id); let opt_variances = tcx.variances_of(item_def_id);
relate_substs_with_variances(self, item_def_id, opt_variances, a_subst, b_subst) relate_substs_with_variances(self, item_def_id, opt_variances, a_subst, b_subst, true)
} }
/// Switch variance for the purpose of relating `a` and `b`. /// Switch variance for the purpose of relating `a` and `b`.
@ -151,13 +151,14 @@ pub fn relate_substs_with_variances<'tcx, R: TypeRelation<'tcx>>(
variances: &[ty::Variance], variances: &[ty::Variance],
a_subst: SubstsRef<'tcx>, a_subst: SubstsRef<'tcx>,
b_subst: SubstsRef<'tcx>, b_subst: SubstsRef<'tcx>,
fetch_ty_for_diag: bool,
) -> RelateResult<'tcx, SubstsRef<'tcx>> { ) -> RelateResult<'tcx, SubstsRef<'tcx>> {
let tcx = relation.tcx(); let tcx = relation.tcx();
let mut cached_ty = None; let mut cached_ty = None;
let params = iter::zip(a_subst, b_subst).enumerate().map(|(i, (a, b))| { let params = iter::zip(a_subst, b_subst).enumerate().map(|(i, (a, b))| {
let variance = variances[i]; let variance = variances[i];
let variance_info = if variance == ty::Invariant { let variance_info = if variance == ty::Invariant && fetch_ty_for_diag {
let ty = let ty =
*cached_ty.get_or_insert_with(|| tcx.bound_type_of(ty_def_id).subst(tcx, a_subst)); *cached_ty.get_or_insert_with(|| tcx.bound_type_of(ty_def_id).subst(tcx, a_subst));
ty::VarianceDiagInfo::Invariant { ty, param_index: i.try_into().unwrap() } ty::VarianceDiagInfo::Invariant { ty, param_index: i.try_into().unwrap() }
@ -170,26 +171,6 @@ pub fn relate_substs_with_variances<'tcx, R: TypeRelation<'tcx>>(
tcx.mk_substs(params) tcx.mk_substs(params)
} }
#[instrument(level = "trace", skip(relation), ret)]
fn relate_opaque_item_substs<'tcx, R: TypeRelation<'tcx>>(
relation: &mut R,
def_id: DefId,
a_subst: SubstsRef<'tcx>,
b_subst: SubstsRef<'tcx>,
) -> RelateResult<'tcx, SubstsRef<'tcx>> {
let tcx = relation.tcx();
let variances = tcx.variances_of(def_id);
debug!(?variances);
let params = iter::zip(a_subst, b_subst).enumerate().map(|(i, (a, b))| {
let variance = variances[i];
let variance_info = ty::VarianceDiagInfo::default();
relation.relate_with_variance(variance, variance_info, a, b)
});
tcx.mk_substs(params)
}
impl<'tcx> Relate<'tcx> for ty::FnSig<'tcx> { impl<'tcx> Relate<'tcx> for ty::FnSig<'tcx> {
fn relate<R: TypeRelation<'tcx>>( fn relate<R: TypeRelation<'tcx>>(
relation: &mut R, relation: &mut R,
@ -581,7 +562,15 @@ pub fn super_relate_tys<'tcx, R: TypeRelation<'tcx>>(
(&ty::Opaque(a_def_id, a_substs), &ty::Opaque(b_def_id, b_substs)) (&ty::Opaque(a_def_id, a_substs), &ty::Opaque(b_def_id, b_substs))
if a_def_id == b_def_id => if a_def_id == b_def_id =>
{ {
let substs = relate_opaque_item_substs(relation, a_def_id, a_substs, b_substs)?; let opt_variances = tcx.variances_of(a_def_id);
let substs = relate_substs_with_variances(
relation,
a_def_id,
opt_variances,
a_substs,
b_substs,
false, // do not fetch `type_of(a_def_id)`, as it will cause a cycle
)?;
Ok(tcx.mk_opaque(a_def_id, substs)) Ok(tcx.mk_opaque(a_def_id, substs))
} }