introduce a separate set of types for finalized proof trees
This commit is contained in:
parent
7a3665d016
commit
e367c04dc6
7 changed files with 334 additions and 187 deletions
345
compiler/rustc_trait_selection/src/solve/inspect.rs
Normal file
345
compiler/rustc_trait_selection/src/solve/inspect.rs
Normal file
|
@ -0,0 +1,345 @@
|
|||
use rustc_middle::{
|
||||
traits::{
|
||||
query::NoSolution,
|
||||
solve::{
|
||||
inspect::{self, CacheHit, CandidateKind},
|
||||
CanonicalInput, Certainty, Goal, QueryInput, QueryResult,
|
||||
},
|
||||
},
|
||||
ty,
|
||||
};
|
||||
|
||||
#[derive(Eq, PartialEq, Debug, Hash, HashStable)]
|
||||
pub struct WipGoalEvaluation<'tcx> {
|
||||
pub uncanonicalized_goal: Goal<'tcx, ty::Predicate<'tcx>>,
|
||||
pub canonicalized_goal: Option<CanonicalInput<'tcx>>,
|
||||
|
||||
pub evaluation_steps: Vec<WipGoalEvaluationStep<'tcx>>,
|
||||
|
||||
pub cache_hit: Option<CacheHit>,
|
||||
|
||||
pub result: Option<QueryResult<'tcx>>,
|
||||
}
|
||||
impl<'tcx> WipGoalEvaluation<'tcx> {
|
||||
pub fn finalize(self) -> inspect::GoalEvaluation<'tcx> {
|
||||
inspect::GoalEvaluation {
|
||||
uncanonicalized_goal: self.uncanonicalized_goal,
|
||||
canonicalized_goal: self.canonicalized_goal.unwrap(),
|
||||
kind: match self.cache_hit {
|
||||
Some(hit) => inspect::GoalEvaluationKind::CacheHit(hit),
|
||||
None => inspect::GoalEvaluationKind::Uncached {
|
||||
revisions: self
|
||||
.evaluation_steps
|
||||
.into_iter()
|
||||
.map(WipGoalEvaluationStep::finalize)
|
||||
.collect(),
|
||||
},
|
||||
},
|
||||
result: self.result.unwrap(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Debug, Hash, HashStable)]
|
||||
pub struct WipAddedGoalsEvaluation<'tcx> {
|
||||
pub evaluations: Vec<Vec<WipGoalEvaluation<'tcx>>>,
|
||||
pub result: Option<Result<Certainty, NoSolution>>,
|
||||
}
|
||||
impl<'tcx> WipAddedGoalsEvaluation<'tcx> {
|
||||
pub fn finalize(self) -> inspect::AddedGoalsEvaluation<'tcx> {
|
||||
inspect::AddedGoalsEvaluation {
|
||||
evaluations: self
|
||||
.evaluations
|
||||
.into_iter()
|
||||
.map(|evaluations| {
|
||||
evaluations.into_iter().map(WipGoalEvaluation::finalize).collect()
|
||||
})
|
||||
.collect(),
|
||||
result: self.result.unwrap(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Debug, Hash, HashStable)]
|
||||
pub struct WipGoalEvaluationStep<'tcx> {
|
||||
pub instantiated_goal: QueryInput<'tcx, ty::Predicate<'tcx>>,
|
||||
|
||||
pub nested_goal_evaluations: Vec<WipAddedGoalsEvaluation<'tcx>>,
|
||||
pub candidates: Vec<WipGoalCandidate<'tcx>>,
|
||||
|
||||
pub result: Option<QueryResult<'tcx>>,
|
||||
}
|
||||
impl<'tcx> WipGoalEvaluationStep<'tcx> {
|
||||
pub fn finalize(self) -> inspect::GoalEvaluationStep<'tcx> {
|
||||
inspect::GoalEvaluationStep {
|
||||
instantiated_goal: self.instantiated_goal,
|
||||
nested_goal_evaluations: self
|
||||
.nested_goal_evaluations
|
||||
.into_iter()
|
||||
.map(WipAddedGoalsEvaluation::finalize)
|
||||
.collect(),
|
||||
candidates: self.candidates.into_iter().map(WipGoalCandidate::finalize).collect(),
|
||||
result: self.result.unwrap(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Eq, PartialEq, Debug, Hash, HashStable)]
|
||||
pub struct WipGoalCandidate<'tcx> {
|
||||
pub nested_goal_evaluations: Vec<WipAddedGoalsEvaluation<'tcx>>,
|
||||
pub candidates: Vec<WipGoalCandidate<'tcx>>,
|
||||
pub kind: Option<CandidateKind<'tcx>>,
|
||||
}
|
||||
impl<'tcx> WipGoalCandidate<'tcx> {
|
||||
pub fn finalize(self) -> inspect::GoalCandidate<'tcx> {
|
||||
inspect::GoalCandidate {
|
||||
nested_goal_evaluations: self
|
||||
.nested_goal_evaluations
|
||||
.into_iter()
|
||||
.map(WipAddedGoalsEvaluation::finalize)
|
||||
.collect(),
|
||||
candidates: self.candidates.into_iter().map(WipGoalCandidate::finalize).collect(),
|
||||
kind: self.kind.unwrap(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum DebugSolver<'tcx> {
|
||||
Root,
|
||||
GoalEvaluation(WipGoalEvaluation<'tcx>),
|
||||
AddedGoalsEvaluation(WipAddedGoalsEvaluation<'tcx>),
|
||||
GoalEvaluationStep(WipGoalEvaluationStep<'tcx>),
|
||||
GoalCandidate(WipGoalCandidate<'tcx>),
|
||||
}
|
||||
|
||||
pub struct ProofTreeBuilder<'tcx>(Option<Box<DebugSolver<'tcx>>>);
|
||||
impl<'tcx> ProofTreeBuilder<'tcx> {
|
||||
pub fn finalize(self) -> Option<inspect::GoalEvaluation<'tcx>> {
|
||||
let wip_tree = *(self.0?);
|
||||
|
||||
match wip_tree {
|
||||
DebugSolver::GoalEvaluation(wip_goal_evaluation) => {
|
||||
Some(wip_goal_evaluation.finalize())
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_root() -> ProofTreeBuilder<'tcx> {
|
||||
Self(Some(Box::new(DebugSolver::Root)))
|
||||
}
|
||||
|
||||
pub fn new_noop() -> ProofTreeBuilder<'tcx> {
|
||||
Self(None)
|
||||
}
|
||||
|
||||
pub fn is_noop(&self) -> bool {
|
||||
self.0.is_none()
|
||||
}
|
||||
|
||||
pub fn new_goal_evaluation(
|
||||
&mut self,
|
||||
goal: Goal<'tcx, ty::Predicate<'tcx>>,
|
||||
) -> ProofTreeBuilder<'tcx> {
|
||||
if self.0.is_none() {
|
||||
return ProofTreeBuilder(None);
|
||||
}
|
||||
|
||||
Self(Some(Box::new(DebugSolver::GoalEvaluation(WipGoalEvaluation {
|
||||
uncanonicalized_goal: goal,
|
||||
canonicalized_goal: None,
|
||||
evaluation_steps: vec![],
|
||||
cache_hit: None,
|
||||
result: None,
|
||||
}))))
|
||||
}
|
||||
pub fn canonicalized_goal(&mut self, canonical_goal: CanonicalInput<'tcx>) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match this {
|
||||
DebugSolver::GoalEvaluation(goal_evaluation) => {
|
||||
assert!(goal_evaluation.canonicalized_goal.is_none());
|
||||
goal_evaluation.canonicalized_goal = Some(canonical_goal)
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
pub fn cache_hit(&mut self, cache_hit: CacheHit) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match this {
|
||||
DebugSolver::GoalEvaluation(goal_evaluation) => {
|
||||
goal_evaluation.cache_hit = Some(cache_hit)
|
||||
}
|
||||
_ => unreachable!(),
|
||||
};
|
||||
}
|
||||
pub fn goal_evaluation(&mut self, goal_evaluation: ProofTreeBuilder<'tcx>) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match (this, *goal_evaluation.0.unwrap()) {
|
||||
(
|
||||
DebugSolver::AddedGoalsEvaluation(WipAddedGoalsEvaluation { evaluations, .. }),
|
||||
DebugSolver::GoalEvaluation(goal_evaluation),
|
||||
) => evaluations.last_mut().unwrap().push(goal_evaluation),
|
||||
(this @ DebugSolver::Root, goal_evaluation) => *this = goal_evaluation,
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_goal_evaluation_step(
|
||||
&mut self,
|
||||
instantiated_goal: QueryInput<'tcx, ty::Predicate<'tcx>>,
|
||||
) -> ProofTreeBuilder<'tcx> {
|
||||
if self.0.is_none() {
|
||||
return Self(None);
|
||||
}
|
||||
|
||||
Self(Some(Box::new(DebugSolver::GoalEvaluationStep(WipGoalEvaluationStep {
|
||||
instantiated_goal,
|
||||
nested_goal_evaluations: vec![],
|
||||
candidates: vec![],
|
||||
result: None,
|
||||
}))))
|
||||
}
|
||||
pub fn goal_evaluation_step(&mut self, goal_eval_step: ProofTreeBuilder<'tcx>) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match (this, *goal_eval_step.0.unwrap()) {
|
||||
(DebugSolver::GoalEvaluation(goal_eval), DebugSolver::GoalEvaluationStep(step)) => {
|
||||
goal_eval.evaluation_steps.push(step);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_goal_candidate(&mut self) -> ProofTreeBuilder<'tcx> {
|
||||
if self.0.is_none() {
|
||||
return Self(None);
|
||||
}
|
||||
|
||||
Self(Some(Box::new(DebugSolver::GoalCandidate(WipGoalCandidate {
|
||||
nested_goal_evaluations: vec![],
|
||||
candidates: vec![],
|
||||
kind: None,
|
||||
}))))
|
||||
}
|
||||
pub fn candidate_kind(&mut self, kind: CandidateKind<'tcx>) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match this {
|
||||
DebugSolver::GoalCandidate(WipGoalCandidate { kind: old_kind @ None, .. }) => {
|
||||
*old_kind = Some(kind)
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
pub fn goal_candidate(&mut self, candidate: ProofTreeBuilder<'tcx>) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match (this, *candidate.0.unwrap()) {
|
||||
(
|
||||
DebugSolver::GoalCandidate(WipGoalCandidate { candidates, .. })
|
||||
| DebugSolver::GoalEvaluationStep(WipGoalEvaluationStep { candidates, .. }),
|
||||
DebugSolver::GoalCandidate(candidate),
|
||||
) => candidates.push(candidate),
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_evaluate_added_goals(&mut self) -> ProofTreeBuilder<'tcx> {
|
||||
if self.0.is_none() {
|
||||
return Self(None);
|
||||
}
|
||||
|
||||
Self(Some(Box::new(DebugSolver::AddedGoalsEvaluation(WipAddedGoalsEvaluation {
|
||||
evaluations: vec![],
|
||||
result: None,
|
||||
}))))
|
||||
}
|
||||
pub fn evaluate_added_goals_loop_start(&mut self) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match this {
|
||||
DebugSolver::AddedGoalsEvaluation(this) => {
|
||||
this.evaluations.push(vec![]);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
pub fn eval_added_goals_result(&mut self, result: Result<Certainty, NoSolution>) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match this {
|
||||
DebugSolver::AddedGoalsEvaluation(this) => {
|
||||
assert!(this.result.is_none());
|
||||
this.result = Some(result);
|
||||
}
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
pub fn added_goals_evaluation(&mut self, goals_evaluation: ProofTreeBuilder<'tcx>) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match (this, *goals_evaluation.0.unwrap()) {
|
||||
(
|
||||
DebugSolver::GoalEvaluationStep(WipGoalEvaluationStep {
|
||||
nested_goal_evaluations,
|
||||
..
|
||||
})
|
||||
| DebugSolver::GoalCandidate(WipGoalCandidate { nested_goal_evaluations, .. }),
|
||||
DebugSolver::AddedGoalsEvaluation(added_goals_evaluation),
|
||||
) => nested_goal_evaluations.push(added_goals_evaluation),
|
||||
_ => unreachable!(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn query_result(&mut self, result: QueryResult<'tcx>) {
|
||||
let this = match self.0.as_mut() {
|
||||
None => return,
|
||||
Some(this) => &mut **this,
|
||||
};
|
||||
|
||||
match this {
|
||||
DebugSolver::GoalEvaluation(goal_evaluation) => {
|
||||
assert!(goal_evaluation.result.is_none());
|
||||
goal_evaluation.result = Some(result);
|
||||
}
|
||||
DebugSolver::Root
|
||||
| DebugSolver::AddedGoalsEvaluation(_)
|
||||
| DebugSolver::GoalCandidate(_) => unreachable!(),
|
||||
DebugSolver::GoalEvaluationStep(evaluation_step) => {
|
||||
assert!(evaluation_step.result.is_none());
|
||||
evaluation_step.result = Some(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue