bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

traits::project: yeet ParamEnv::reveal

Browse source
This commit is contained in:
lcnr 2024-10-31 12:06:19 +01:00
parent 4d296eabe4
commit 84295b917d
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_trait_selection/src/traits/project.rs
View file

@ -16,7 +16,7 @@ use rustc_middle::traits::{BuiltinImplSource, ImplSource, ImplSourceUserDefinedD
use rustc_middle::ty::fast_reject::DeepRejectCtxt; use rustc_middle::ty::fast_reject::DeepRejectCtxt;
use rustc_middle::ty::fold::TypeFoldable; use rustc_middle::ty::fold::TypeFoldable;
use rustc_middle::ty::visit::{MaxUniverse, TypeVisitable, TypeVisitableExt}; use rustc_middle::ty::visit::{MaxUniverse, TypeVisitable, TypeVisitableExt};
use rustc_middle::ty::{self, Term, Ty, TyCtxt, Upcast}; use rustc_middle::ty::{self, Term, Ty, TyCtxt, TypingMode, Upcast};
use rustc_middle::{bug, span_bug}; use rustc_middle::{bug, span_bug};
use rustc_span::symbol::sym; use rustc_span::symbol::sym;
use tracing::{debug, instrument}; use tracing::{debug, instrument};
@ -975,12 +975,8 @@ fn assemble_candidates_from_impls<'cx, 'tcx>(
// and the obligation is monomorphic, otherwise passes such as // and the obligation is monomorphic, otherwise passes such as
// transmute checking and polymorphic MIR optimizations could // transmute checking and polymorphic MIR optimizations could
// get a result which isn't correct for all monomorphizations. // get a result which isn't correct for all monomorphizations.
if obligation.param_env.reveal() == Reveal::All { match selcx.infcx.typing_mode(obligation.param_env) {
// NOTE(eddyb) inference variables can resolve to parameters, so TypingMode::Coherence | TypingMode::Analysis { .. } => {
// assume `poly_trait_ref` isn't monomorphic, if it contains any.
let poly_trait_ref = selcx.infcx.resolve_vars_if_possible(trait_ref);
!poly_trait_ref.still_further_specializable()
} else {
debug!( debug!(
assoc_ty = ?selcx.tcx().def_path_str(node_item.item.def_id), assoc_ty = ?selcx.tcx().def_path_str(node_item.item.def_id),
?obligation.predicate, ?obligation.predicate,
@ -988,6 +984,13 @@ fn assemble_candidates_from_impls<'cx, 'tcx>(
); );
false false
} }
TypingMode::PostAnalysis => {
// NOTE(eddyb) inference variables can resolve to parameters, so
// assume `poly_trait_ref` isn't monomorphic, if it contains any.
let poly_trait_ref = selcx.infcx.resolve_vars_if_possible(trait_ref);
!poly_trait_ref.still_further_specializable()
}
}
} }
} }
ImplSource::Builtin(BuiltinImplSource::Misc, _) => { ImplSource::Builtin(BuiltinImplSource::Misc, _) => {