nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Match on both reveal and solver mode at the same time

Browse Source
This commit is contained in:
Michael Goulet 2023-05-23 00:56:24 +00:00
parent 980da667fe
commit dd98198972
1 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
compiler/rustc_trait_selection/src/solve/opaques.rs
View File

@ -15,51 +15,48 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
let opaque_ty = goal.predicate.projection_ty; let opaque_ty = goal.predicate.projection_ty;
let expected = goal.predicate.term.ty().expect("no such thing as an opaque const"); let expected = goal.predicate.term.ty().expect("no such thing as an opaque const");
match goal.param_env.reveal() { match (goal.param_env.reveal(), self.solver_mode()) {
Reveal::UserFacing => match self.solver_mode() { (Reveal::UserFacing, SolverMode::Normal) => {
SolverMode::Normal => { let Some(opaque_ty_def_id) = opaque_ty.def_id.as_local() else {
let Some(opaque_ty_def_id) = opaque_ty.def_id.as_local() else { return Err(NoSolution);
return Err(NoSolution); };
}; let opaque_ty =
let opaque_ty = ty::OpaqueTypeKey { def_id: opaque_ty_def_id, substs: opaque_ty.substs };
ty::OpaqueTypeKey { def_id: opaque_ty_def_id, substs: opaque_ty.substs }; // FIXME: at some point we should call queries without defining
// FIXME: at some point we should call queries without defining // new opaque types but having the existing opaque type definitions.
// new opaque types but having the existing opaque type definitions. // This will require moving this below "Prefer opaques registered already".
// This will require moving this below "Prefer opaques registered already". if !self.can_define_opaque_ty(opaque_ty_def_id) {
if !self.can_define_opaque_ty(opaque_ty_def_id) { return Err(NoSolution);
}
// FIXME: This may have issues when the substs contain aliases...
match self.tcx().uses_unique_placeholders_ignoring_regions(opaque_ty.substs) {
Err(NotUniqueParam::NotParam(param)) if param.is_non_region_infer() => {
return self.evaluate_added_goals_and_make_canonical_response(
Certainty::AMBIGUOUS,
);
}
Err(_) => {
return Err(NoSolution); return Err(NoSolution);
} }
// FIXME: This may have issues when the substs contain aliases... Ok(()) => {}
match self.tcx().uses_unique_placeholders_ignoring_regions(opaque_ty.substs) {
Err(NotUniqueParam::NotParam(param)) if param.is_non_region_infer() => {
return self.evaluate_added_goals_and_make_canonical_response(
Certainty::AMBIGUOUS,
);
}
Err(_) => {
return Err(NoSolution);
}
Ok(()) => {}
}
// Prefer opaques registered already.
let matches =
self.unify_existing_opaque_tys(goal.param_env, opaque_ty, expected);
if !matches.is_empty() {
if let Some(response) = self.try_merge_responses(&matches) {
return Ok(response);
} else {
return self.flounder(&matches);
}
}
// Otherwise, define a new opaque type
self.register_opaque_ty(opaque_ty, expected, goal.param_env)?;
self.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
} }
SolverMode::Coherence => { // Prefer opaques registered already.
self.evaluate_added_goals_and_make_canonical_response(Certainty::AMBIGUOUS) let matches = self.unify_existing_opaque_tys(goal.param_env, opaque_ty, expected);
if !matches.is_empty() {
if let Some(response) = self.try_merge_responses(&matches) {
return Ok(response);
} else {
return self.flounder(&matches);
}
} }
}, // Otherwise, define a new opaque type
Reveal::All => { self.register_opaque_ty(opaque_ty, expected, goal.param_env)?;
self.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
}
(Reveal::UserFacing, SolverMode::Coherence) => {
self.evaluate_added_goals_and_make_canonical_response(Certainty::AMBIGUOUS)
}
(Reveal::All, _) => {
// FIXME: Add an assertion that opaque type storage is empty. // FIXME: Add an assertion that opaque type storage is empty.
let actual = tcx.type_of(opaque_ty.def_id).subst(tcx, opaque_ty.substs); let actual = tcx.type_of(opaque_ty.def_id).subst(tcx, opaque_ty.substs);
self.eq(goal.param_env, expected, actual)?; self.eq(goal.param_env, expected, actual)?;