Skip to content

Commit 4651421

Browse files
borsbors
committed
Auto merge of rust-lang#112835 - lcnr:proof-tree-nits, r=BoxyUwU
proof tree nits r? `@BoxyUwU`
2 parents a34cead + e4b171a commit 4651421

File tree

10 files changed

+310
-295
lines changed

10 files changed

+310
-295
lines changed

‎compiler/rustc_middle/src/traits/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -991,9 +991,3 @@ pub enum DefiningAnchor {
991991
/// Used to catch type mismatch errors when handling opaque types.
992992
Error,
993993
}
994-
995-
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, HashStable)]
996-
pub enum IsNormalizesToHack {
997-
Yes,
998-
No,
999-
}

‎compiler/rustc_middle/src/traits/solve.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,3 +228,9 @@ impl<'tcx> TypeVisitable<TyCtxt<'tcx>> for PredefinedOpaques<'tcx> {
228228
self.opaque_types.visit_with(visitor)
229229
}
230230
}
231+
232+
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, HashStable)]
233+
pub enum IsNormalizesToHack {
234+
Yes,
235+
No,
236+
}

‎compiler/rustc_middle/src/traits/solve/inspect.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
use super::{CanonicalInput, Certainty, Goal, NoSolution, QueryInput, QueryResult};
2-
use crate::{traits::IsNormalizesToHack, ty};
1+
use super::{
2+
CanonicalInput, Certainty, Goal, IsNormalizesToHack, NoSolution, QueryInput, QueryResult,
3+
};
4+
use crate::ty;
35
use format::ProofTreeFormatter;
46
use std::fmt::{Debug, Write};
57

@@ -22,6 +24,7 @@ pub struct GoalEvaluation<'tcx> {
2224

2325
pub result: QueryResult<'tcx>,
2426
}
27+
2528
#[derive(Eq, PartialEq, Hash, HashStable)]
2629
pub enum GoalEvaluationKind<'tcx> {
2730
CacheHit(CacheHit),
@@ -65,6 +68,7 @@ pub struct GoalCandidate<'tcx> {
6568
pub candidates: Vec<GoalCandidate<'tcx>>,
6669
pub kind: CandidateKind<'tcx>,
6770
}
71+
6872
#[derive(Eq, PartialEq, Debug, Hash, HashStable)]
6973
pub enum CandidateKind<'tcx> {
7074
/// Probe entered when normalizing the self ty during candidate assembly

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,11 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
110110
direction: ty::AliasRelationDirection,
111111
invert: Invert,
112112
) -> QueryResult<'tcx> {
113-
self.probe(
113+
self.probe(|r| CandidateKind::Candidate { name: "normalizes-to".into(), result: *r }).enter(
114114
|ecx| {
115115
ecx.normalizes_to_inner(param_env, alias, other, direction, invert)?;
116116
ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
117117
},
118-
|r| CandidateKind::Candidate { name: "normalizes-to".into(), result: *r },
119118
)
120119
}
121120

@@ -157,7 +156,7 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
157156
alias_rhs: ty::AliasTy<'tcx>,
158157
direction: ty::AliasRelationDirection,
159158
) -> QueryResult<'tcx> {
160-
self.probe(
159+
self.probe(|r| CandidateKind::Candidate { name: "substs relate".into(), result: *r }).enter(
161160
|ecx| {
162161
match direction {
163162
ty::AliasRelationDirection::Equate => {
@@ -170,7 +169,6 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
170169

171170
ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
172171
},
173-
|r| CandidateKind::Candidate { name: "substs relate".into(), result: *r },
174172
)
175173
}
176174

@@ -181,8 +179,8 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
181179
rhs: ty::Term<'tcx>,
182180
direction: ty::AliasRelationDirection,
183181
) -> QueryResult<'tcx> {
184-
self.probe(
185-
|ecx| {
182+
self.probe(|r| CandidateKind::Candidate { name: "bidir normalizes-to".into(), result: *r })
183+
.enter(|ecx| {
186184
ecx.normalizes_to_inner(
187185
param_env,
188186
lhs.to_alias_ty(ecx.tcx()).unwrap(),
@@ -198,8 +196,6 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
198196
Invert::Yes,
199197
)?;
200198
ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
201-
},
202-
|r| CandidateKind::Candidate { name: "bidir normalizes-to".into(), result: *r },
203-
)
199+
})
204200
}
205201
}

‎compiler/rustc_trait_selection/src/solve/assembly/mod.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
337337
return
338338
};
339339

340-
let normalized_self_candidates: Result<_, NoSolution> = self.probe(
341-
|ecx| {
340+
let normalized_self_candidates: Result<_, NoSolution> =
341+
self.probe(|_| CandidateKind::NormalizedSelfTyAssembly).enter(|ecx| {
342342
ecx.with_incremented_depth(
343343
|ecx| {
344344
let result = ecx.evaluate_added_goals_and_make_canonical_response(
@@ -368,9 +368,7 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
368368
Ok(ecx.assemble_and_evaluate_candidates(goal))
369369
},
370370
)
371-
},
372-
|_| CandidateKind::NormalizedSelfTyAssembly,
373-
);
371+
});
374372

375373
if let Ok(normalized_self_candidates) = normalized_self_candidates {
376374
candidates.extend(normalized_self_candidates);

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

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ use rustc_infer::traits::ObligationCause;
1111
use rustc_middle::infer::unify_key::{ConstVariableOrigin, ConstVariableOriginKind};
1212
use rustc_middle::traits::solve::inspect::{self, CandidateKind};
1313
use rustc_middle::traits::solve::{
14-
CanonicalInput, CanonicalResponse, Certainty, MaybeCause, PredefinedOpaques,
15-
PredefinedOpaquesData, QueryResult,
14+
CanonicalInput, CanonicalResponse, Certainty, IsNormalizesToHack, MaybeCause,
15+
PredefinedOpaques, PredefinedOpaquesData, QueryResult,
1616
};
17-
use rustc_middle::traits::{DefiningAnchor, IsNormalizesToHack};
17+
use rustc_middle::traits::DefiningAnchor;
1818
use rustc_middle::ty::{
1919
self, OpaqueTypeKey, Ty, TyCtxt, TypeFoldable, TypeSuperVisitable, TypeVisitable,
2020
TypeVisitableExt, TypeVisitor,
@@ -30,6 +30,7 @@ use super::SolverMode;
3030
use super::{search_graph::SearchGraph, Goal};
3131

3232
mod canonical;
33+
mod probe;
3334

3435
pub struct EvalCtxt<'a, 'tcx> {
3536
/// The inference context that backs (mostly) inference and placeholder terms
@@ -529,32 +530,6 @@ impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {
529530
}
530531

531532
impl<'tcx> EvalCtxt<'_, 'tcx> {
532-
/// `probe_kind` is only called when proof tree building is enabled so it can be
533-
/// as expensive as necessary to output the desired information.
534-
pub(super) fn probe<T>(
535-
&mut self,
536-
f: impl FnOnce(&mut EvalCtxt<'_, 'tcx>) -> T,
537-
probe_kind: impl FnOnce(&T) -> CandidateKind<'tcx>,
538-
) -> T {
539-
let mut ecx = EvalCtxt {
540-
infcx: self.infcx,
541-
var_values: self.var_values,
542-
predefined_opaques_in_body: self.predefined_opaques_in_body,
543-
max_input_universe: self.max_input_universe,
544-
search_graph: self.search_graph,
545-
nested_goals: self.nested_goals.clone(),
546-
tainted: self.tainted,
547-
inspect: self.inspect.new_goal_candidate(),
548-
};
549-
let r = self.infcx.probe(|_| f(&mut ecx));
550-
if !self.inspect.is_noop() {
551-
let cand_kind = probe_kind(&r);
552-
ecx.inspect.candidate_kind(cand_kind);
553-
self.inspect.goal_candidate(ecx.inspect);
554-
}
555-
r
556-
}
557-
558533
pub(super) fn tcx(&self) -> TyCtxt<'tcx> {
559534
self.infcx.tcx
560535
}
@@ -868,8 +843,12 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
868843
if candidate_key.def_id != key.def_id {
869844
continue;
870845
}
871-
values.extend(self.probe(
872-
|ecx| {
846+
values.extend(
847+
self.probe(|r| CandidateKind::Candidate {
848+
name: "opaque type storage".into(),
849+
result: *r,
850+
})
851+
.enter(|ecx| {
873852
for (a, b) in std::iter::zip(candidate_key.substs, key.substs) {
874853
ecx.eq(param_env, a, b)?;
875854
}
@@ -881,9 +860,8 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
881860
candidate_ty,
882861
);
883862
ecx.evaluate_added_goals_and_make_canonical_response(Certainty::Yes)
884-
},
885-
|r| CandidateKind::Candidate { name: "opaque type storage".into(), result: *r },
886-
));
863+
}),
864+
);
887865
}
888866
values
889867
}

‎compiler/rustc_trait_selection/src/solve/eval_ctxt/probe.rs

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
use super::EvalCtxt;
2+
use rustc_middle::traits::solve::inspect;
3+
use std::marker::PhantomData;
4+
5+
pub(in crate::solve) struct ProbeCtxt<'me, 'a, 'tcx, F, T> {
6+
ecx: &'me mut EvalCtxt<'a, 'tcx>,
7+
probe_kind: F,
8+
_result: PhantomData<T>,
9+
}
10+
11+
impl<'tcx, F, T> ProbeCtxt<'_, '_, 'tcx, F, T>
12+
where
13+
F: FnOnce(&T) -> inspect::CandidateKind<'tcx>,
14+
{
15+
pub(in crate::solve) fn enter(self, f: impl FnOnce(&mut EvalCtxt<'_, 'tcx>) -> T) -> T {
16+
let ProbeCtxt { ecx: outer_ecx, probe_kind, _result } = self;
17+
18+
let mut nested_ecx = EvalCtxt {
19+
infcx: outer_ecx.infcx,
20+
var_values: outer_ecx.var_values,
21+
predefined_opaques_in_body: outer_ecx.predefined_opaques_in_body,
22+
max_input_universe: outer_ecx.max_input_universe,
23+
search_graph: outer_ecx.search_graph,
24+
nested_goals: outer_ecx.nested_goals.clone(),
25+
tainted: outer_ecx.tainted,
26+
inspect: outer_ecx.inspect.new_goal_candidate(),
27+
};
28+
let r = nested_ecx.infcx.probe(|_| f(&mut nested_ecx));
29+
if !outer_ecx.inspect.is_noop() {
30+
let cand_kind = probe_kind(&r);
31+
nested_ecx.inspect.candidate_kind(cand_kind);
32+
outer_ecx.inspect.goal_candidate(nested_ecx.inspect);
33+
}
34+
r
35+
}
36+
}
37+
38+
impl<'a, 'tcx> EvalCtxt<'a, 'tcx> {
39+
/// `probe_kind` is only called when proof tree building is enabled so it can be
40+
/// as expensive as necessary to output the desired information.
41+
pub(in crate::solve) fn probe<F, T>(&mut self, probe_kind: F) -> ProbeCtxt<'_, 'a, 'tcx, F, T>
42+
where
43+
F: FnOnce(&T) -> inspect::CandidateKind<'tcx>,
44+
{
45+
ProbeCtxt { ecx: self, probe_kind, _result: PhantomData }
46+
}
47+
}

0 commit comments

Comments
 (0)