Skip to content

Commit 7d2be88

Browse files
compiler-errorscompiler-errors
committed
Fix impl for SolverDelegate
1 parent 532149e commit 7d2be88

File tree

11 files changed

+385
-85
lines changed

11 files changed

+385
-85
lines changed

‎compiler/rustc_next_trait_solver/src/infcx.rs

+8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ pub trait SolverDelegate: Sized {
99
type Interner: Interner;
1010
fn interner(&self) -> Self::Interner;
1111

12+
type Span: Copy;
13+
1214
fn solver_mode(&self) -> SolverMode;
1315

1416
fn build_with_canonical<V>(
@@ -57,6 +59,12 @@ pub trait SolverDelegate: Sized {
5759
def_id: <Self::Interner as Interner>::DefId,
5860
) -> <Self::Interner as Interner>::GenericArgs;
5961

62+
fn fresh_var_for_kind_with_span(
63+
&self,
64+
arg: <Self::Interner as Interner>::GenericArg,
65+
span: Self::Span,
66+
) -> <Self::Interner as Interner>::GenericArg;
67+
6068
fn instantiate_binder_with_infer<T: TypeFoldable<Self::Interner> + Copy>(
6169
&self,
6270
value: ty::Binder<Self::Interner, T>,

‎compiler/rustc_next_trait_solver/src/solve/eval_ctxt/canonical.rs

+32
Original file line numberDiff line numberDiff line change
@@ -394,3 +394,35 @@ where
394394
state,
395395
)
396396
}
397+
398+
// FIXME: needs to be pub to be accessed by downstream
399+
// `rustc_trait_selection::solve::inspect::analyse`.
400+
pub fn instantiate_canonical_state<Infcx, I, T: TypeFoldable<I>>(
401+
infcx: &Infcx,
402+
span: Infcx::Span,
403+
param_env: I::ParamEnv,
404+
orig_values: &mut Vec<I::GenericArg>,
405+
state: inspect::CanonicalState<I, T>,
406+
) -> T
407+
where
408+
Infcx: SolverDelegate<Interner = I>,
409+
I: Interner,
410+
{
411+
// In case any fresh inference variables have been created between `state`
412+
// and the previous instantiation, extend `orig_values` for it.
413+
assert!(orig_values.len() <= state.value.var_values.len());
414+
for &arg in &state.value.var_values.var_values[orig_values.len()..state.value.var_values.len()]
415+
{
416+
// FIXME: This is so ugly.
417+
let unconstrained = infcx.fresh_var_for_kind_with_span(arg, span);
418+
orig_values.push(unconstrained);
419+
}
420+
421+
let instantiation =
422+
EvalCtxt::compute_query_response_instantiation_values(infcx, orig_values, &state);
423+
424+
let inspect::State { var_values, data } = infcx.instantiate_canonical(state, instantiation);
425+
426+
EvalCtxt::unify_query_var_values(infcx, param_env, orig_values, var_values);
427+
data
428+
}

‎compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs

+25
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,17 @@ pub trait SolverDelegateEvalExt: SolverDelegate {
127127
goal: Goal<Self::Interner, <Self::Interner as Interner>::Predicate>,
128128
generate_proof_tree: GenerateProofTree,
129129
) -> (Result<(bool, Certainty), NoSolution>, Option<inspect::GoalEvaluation<Self::Interner>>);
130+
131+
// FIXME: This is only exposed because we need to use it in `analyse.rs`
132+
// which is not yet uplifted. Once that's done, we should remove this.
133+
fn evaluate_root_goal_raw(
134+
&self,
135+
goal: Goal<Self::Interner, <Self::Interner as Interner>::Predicate>,
136+
generate_proof_tree: GenerateProofTree,
137+
) -> (
138+
Result<(NestedNormalizationGoals<Self::Interner>, bool, Certainty), NoSolution>,
139+
Option<inspect::GoalEvaluation<Self::Interner>>,
140+
);
130141
}
131142

132143
impl<Infcx, I> SolverDelegateEvalExt for Infcx
@@ -148,6 +159,20 @@ where
148159
ecx.evaluate_goal(GoalEvaluationKind::Root, GoalSource::Misc, goal)
149160
})
150161
}
162+
163+
#[instrument(level = "debug", skip(self))]
164+
fn evaluate_root_goal_raw(
165+
&self,
166+
goal: Goal<I, I::Predicate>,
167+
generate_proof_tree: GenerateProofTree,
168+
) -> (
169+
Result<(NestedNormalizationGoals<I>, bool, Certainty), NoSolution>,
170+
Option<inspect::GoalEvaluation<I>>,
171+
) {
172+
EvalCtxt::enter_root(self, generate_proof_tree, |ecx| {
173+
ecx.evaluate_goal_raw(GoalEvaluationKind::Root, GoalSource::Misc, goal)
174+
})
175+
}
151176
}
152177

153178
impl<'a, Infcx, I> EvalCtxt<'a, Infcx>

‎compiler/rustc_next_trait_solver/src/solve/inspect/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ pub use rustc_type_ir::solve::inspect::*;
22

33
mod build;
44
pub(in crate::solve) use build::*;
5+
6+
pub use crate::solve::eval_ctxt::canonical::instantiate_canonical_state;

‎compiler/rustc_next_trait_solver/src/solve/search_graph.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::solve::{
1212
};
1313

1414
#[derive(Copy, Clone, PartialEq, Eq, Debug)]
15-
pub struct Limit(usize);
15+
pub struct SolverLimit(usize);
1616

1717
rustc_index::newtype_index! {
1818
#[orderable]
@@ -35,7 +35,7 @@ bitflags::bitflags! {
3535
struct StackEntry<I: Interner> {
3636
input: CanonicalInput<I>,
3737

38-
available_depth: Limit,
38+
available_depth: SolverLimit,
3939

4040
/// The maximum depth reached by this stack entry, only up-to date
4141
/// for the top of the stack and lazily updated for the rest.
@@ -164,19 +164,19 @@ impl<I: Interner> SearchGraph<I> {
164164
fn allowed_depth_for_nested(
165165
tcx: I,
166166
stack: &IndexVec<StackDepth, StackEntry<I>>,
167-
) -> Option<Limit> {
167+
) -> Option<SolverLimit> {
168168
if let Some(last) = stack.raw.last() {
169169
if last.available_depth.0 == 0 {
170170
return None;
171171
}
172172

173173
Some(if last.encountered_overflow {
174-
Limit(last.available_depth.0 / 4)
174+
SolverLimit(last.available_depth.0 / 4)
175175
} else {
176-
Limit(last.available_depth.0 - 1)
176+
SolverLimit(last.available_depth.0 - 1)
177177
})
178178
} else {
179-
Some(Limit(tcx.recursion_limit()))
179+
Some(SolverLimit(tcx.recursion_limit()))
180180
}
181181
}
182182

@@ -414,12 +414,12 @@ impl<I: Interner> SearchGraph<I> {
414414
&mut self,
415415
tcx: I,
416416
input: CanonicalInput<I>,
417-
available_depth: Limit,
417+
available_depth: SolverLimit,
418418
inspect: &mut ProofTreeBuilder<Infcx>,
419419
) -> Option<QueryResult<I>> {
420420
let CacheData { result, proof_tree, additional_depth, encountered_overflow } = self
421421
.global_cache(tcx)
422-
// TODO: Awkward `Limit -> usize -> Limit`.
422+
// FIXME: Awkward `Limit -> usize -> Limit`.
423423
.get(tcx, input, self.stack.iter().map(|e| e.input), available_depth.0)?;
424424

425425
// If we're building a proof tree and the current cache entry does not

‎compiler/rustc_trait_selection/src/solve.rs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
pub use rustc_next_trait_solver::solve::*;
2+
3+
mod fulfill;
4+
mod infcx;
5+
pub mod inspect;
6+
mod normalize;
7+
mod select;
8+
9+
pub use fulfill::{FulfillmentCtxt, NextSolverError};
10+
pub(crate) use normalize::deeply_normalize_for_diagnostics;
11+
pub use normalize::{deeply_normalize, deeply_normalize_with_skipped_universes};
12+
pub use select::InferCtxtSelectExt;

‎compiler/rustc_trait_selection/src/solve/fulfill.rs

+13-5
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ use rustc_infer::traits::{
1212
use rustc_middle::bug;
1313
use rustc_middle::ty::error::{ExpectedFound, TypeError};
1414
use rustc_middle::ty::{self, TyCtxt};
15+
use rustc_next_trait_solver::solve::{GenerateProofTree, SolverDelegateEvalExt as _};
1516
use rustc_span::symbol::sym;
1617

1718
use crate::traits::{FulfillmentError, FulfillmentErrorCode, ScrubbedTraitError};
1819

19-
use super::eval_ctxt::GenerateProofTree;
20+
use super::infcx::SolverDelegate;
2021
use super::inspect::{self, ProofTreeInferCtxtExt, ProofTreeVisitor};
21-
use super::{Certainty, InferCtxtEvalExt};
22+
use super::Certainty;
2223

2324
/// A trait engine using the new trait solver.
2425
///
@@ -83,7 +84,9 @@ impl<'tcx> ObligationStorage<'tcx> {
8384
// change.
8485
self.overflowed.extend(self.pending.extract_if(|o| {
8586
let goal = o.clone().into();
86-
let result = infcx.evaluate_root_goal(goal, GenerateProofTree::No).0;
87+
let result = <&SolverDelegate<'tcx>>::from(infcx)
88+
.evaluate_root_goal(goal, GenerateProofTree::No)
89+
.0;
8790
match result {
8891
Ok((has_changed, _)) => has_changed,
8992
_ => false,
@@ -165,7 +168,9 @@ where
165168
let mut has_changed = false;
166169
for obligation in self.obligations.unstalled_for_select() {
167170
let goal = obligation.clone().into();
168-
let result = infcx.evaluate_root_goal(goal, GenerateProofTree::No).0;
171+
let result = <&SolverDelegate<'tcx>>::from(infcx)
172+
.evaluate_root_goal(goal, GenerateProofTree::No)
173+
.0;
169174
self.inspect_evaluated_obligation(infcx, &obligation, &result);
170175
let (changed, certainty) = match result {
171176
Ok(result) => result,
@@ -288,7 +293,10 @@ fn fulfillment_error_for_stalled<'tcx>(
288293
root_obligation: PredicateObligation<'tcx>,
289294
) -> FulfillmentError<'tcx> {
290295
let (code, refine_obligation) = infcx.probe(|_| {
291-
match infcx.evaluate_root_goal(root_obligation.clone().into(), GenerateProofTree::No).0 {
296+
match <&SolverDelegate<'tcx>>::from(infcx)
297+
.evaluate_root_goal(root_obligation.clone().into(), GenerateProofTree::No)
298+
.0
299+
{
292300
Ok((_, Certainty::Maybe(MaybeCause::Ambiguity))) => {
293301
(FulfillmentErrorCode::Ambiguity { overflow: None }, true)
294302
}

0 commit comments

Comments
 (0)