bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use InferCtxt::probe to properly detect ambiguous candidates

Browse source
This commit is contained in:
León Orell Valerian Liehr 2023-02-17 16:58:18 +01:00
parent 3dc38fbc91
commit 6065867a7e
No known key found for this signature in database
GPG key ID: D17A07215F68E713
3 changed files with 62 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

47
compiler/rustc_hir_analysis/src/astconv/mod.rs
View file

@ -2235,35 +2235,40 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
let mut applicable_candidates: Vec<_> = candidates
.iter()
.filter_map(|&(impl_, (assoc_item, def_scope))| {
let ocx = ObligationCtxt::new(&infcx);
infcx.probe(|_| {
let ocx = ObligationCtxt::new_in_snapshot(&infcx);
let impl_ty = tcx.type_of(impl_);
let impl_substs = self.fresh_item_substs(impl_, &infcx);
let impl_ty = impl_ty.subst(tcx, impl_substs);
let impl_ty = ocx.normalize(&cause, param_env, impl_ty);
let impl_ty = tcx.type_of(impl_);
let impl_substs = self.fresh_item_substs(impl_, &infcx);
let impl_ty = impl_ty.subst(tcx, impl_substs);
let impl_ty = ocx.normalize(&cause, param_env, impl_ty);
// Check that the Self-types can be related.
// FIXME(fmease): Should we use `eq` here?
ocx.sup(&ObligationCause::dummy(), param_env, impl_ty, self_ty).ok()?;
// Check that the Self-types can be related.
// FIXME(fmease): Should we use `eq` here?
ocx.sup(&ObligationCause::dummy(), param_env, impl_ty, self_ty).ok()?;
// Check whether the impl imposes obligations we have to worry about.
let impl_bounds = tcx.predicates_of(impl_);
let impl_bounds = impl_bounds.instantiate(tcx, impl_substs);
// Check whether the impl imposes obligations we have to worry about.
let impl_bounds = tcx.predicates_of(impl_);
let impl_bounds = impl_bounds.instantiate(tcx, impl_substs);
let impl_bounds = ocx.normalize(&cause, param_env, impl_bounds);
let impl_bounds = ocx.normalize(&cause, param_env, impl_bounds);
let impl_obligations =
traits::predicates_for_generics(|_, _| cause.clone(), param_env, impl_bounds);
let impl_obligations = traits::predicates_for_generics(
|_, _| cause.clone(),
param_env,
impl_bounds,
);
ocx.register_obligations(impl_obligations);
ocx.register_obligations(impl_obligations);
let errors = ocx.select_where_possible();
if !errors.is_empty() {
fulfillment_errors = errors;
return None;
}
let errors = ocx.select_where_possible();
if !errors.is_empty() {
fulfillment_errors = errors;
return None;
}
Some((assoc_item, def_scope))
Some((assoc_item, def_scope))
})
})
.collect();