Skip to content

Commit 53269c7

Browse files
ZoxcZoxc
committed
Update trait queries
1 parent b164a2d commit 53269c7

File tree

9 files changed

+69
-36
lines changed

9 files changed

+69
-36
lines changed

‎src/librustc/arena.rs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,44 @@ macro_rules! arena_types {
2020
[] item_local_set: rustc::util::nodemap::ItemLocalSet,
2121
[decode] mir_const_qualif: rustc_data_structures::bit_set::BitSet<rustc::mir::Local>,
2222
[] trait_impls_of: rustc::ty::trait_def::TraitImpls,
23+
[] dropck_outlives:
24+
rustc::infer::canonical::Canonical<'tcx,
25+
rustc::infer::canonical::QueryResponse<'tcx,
26+
rustc::traits::query::dropck_outlives::DropckOutlivesResult<'tcx>
27+
>
28+
>,
29+
[] normalize_projection_ty:
30+
rustc::infer::canonical::Canonical<'tcx,
31+
rustc::infer::canonical::QueryResponse<'tcx,
32+
rustc::traits::query::normalize::NormalizationResult<'tcx>
33+
>
34+
>,
35+
[] implied_outlives_bounds:
36+
rustc::infer::canonical::Canonical<'tcx,
37+
rustc::infer::canonical::QueryResponse<'tcx,
38+
Vec<rustc::traits::query::outlives_bounds::OutlivesBound<'tcx>>
39+
>
40+
>,
41+
[] type_op_subtype:
42+
rustc::infer::canonical::Canonical<'tcx,
43+
rustc::infer::canonical::QueryResponse<'tcx, ()>
44+
>,
45+
[] type_op_normalize_poly_fn_sig:
46+
rustc::infer::canonical::Canonical<'tcx,
47+
rustc::infer::canonical::QueryResponse<'tcx, rustc::ty::PolyFnSig<'tcx>>
48+
>,
49+
[] type_op_normalize_fn_sig:
50+
rustc::infer::canonical::Canonical<'tcx,
51+
rustc::infer::canonical::QueryResponse<'tcx, rustc::ty::FnSig<'tcx>>
52+
>,
53+
[] type_op_normalize_predicate:
54+
rustc::infer::canonical::Canonical<'tcx,
55+
rustc::infer::canonical::QueryResponse<'tcx, rustc::ty::Predicate<'tcx>>
56+
>,
57+
[] type_op_normalize_ty:
58+
rustc::infer::canonical::Canonical<'tcx,
59+
rustc::infer::canonical::QueryResponse<'tcx, rustc::ty::Ty<'tcx>>
60+
>,
2361
], $tcx);
2462
)
2563
}

‎src/librustc/infer/canonical/mod.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
2424
use crate::infer::{InferCtxt, RegionVariableOrigin, TypeVariableOrigin};
2525
use rustc_data_structures::indexed_vec::IndexVec;
26-
use rustc_data_structures::sync::Lrc;
2726
use rustc_macros::HashStable;
2827
use serialize::UseSpecializedDecodable;
2928
use smallvec::SmallVec;
@@ -186,7 +185,7 @@ pub struct QueryResponse<'tcx, R> {
186185
pub type Canonicalized<'gcx, V> = Canonical<'gcx, <V as Lift<'gcx>>::Lifted>;
187186

188187
pub type CanonicalizedQueryResponse<'gcx, T> =
189-
Lrc<Canonical<'gcx, QueryResponse<'gcx, <T as Lift<'gcx>>::Lifted>>>;
188+
&'gcx Canonical<'gcx, QueryResponse<'gcx, <T as Lift<'gcx>>::Lifted>>;
190189

191190
/// Indicates whether or not we were able to prove the query to be
192191
/// true.

‎src/librustc/infer/canonical/query_response.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//!
88
//! [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
99
10+
use crate::arena::ArenaAllocatable;
1011
use crate::infer::canonical::substitute::substitute_value;
1112
use crate::infer::canonical::{
1213
Canonical, CanonicalVarValues, CanonicalizedQueryResponse, Certainty,
@@ -17,7 +18,6 @@ use crate::infer::InferCtxtBuilder;
1718
use crate::infer::{InferCtxt, InferOk, InferResult};
1819
use rustc_data_structures::indexed_vec::Idx;
1920
use rustc_data_structures::indexed_vec::IndexVec;
20-
use rustc_data_structures::sync::Lrc;
2121
use std::fmt::Debug;
2222
use syntax_pos::DUMMY_SP;
2323
use crate::traits::query::{Fallible, NoSolution};
@@ -54,6 +54,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxtBuilder<'cx, 'gcx, 'tcx> {
5454
where
5555
K: TypeFoldable<'tcx>,
5656
R: Debug + Lift<'gcx> + TypeFoldable<'tcx>,
57+
Canonical<'gcx, <QueryResponse<'gcx, R> as Lift<'gcx>>::Lifted>: ArenaAllocatable,
5758
{
5859
self.enter_with_canonical(
5960
DUMMY_SP,
@@ -99,6 +100,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
99100
) -> Fallible<CanonicalizedQueryResponse<'gcx, T>>
100101
where
101102
T: Debug + Lift<'gcx> + TypeFoldable<'tcx>,
103+
Canonical<'gcx, <QueryResponse<'gcx, T> as Lift<'gcx>>::Lifted>: ArenaAllocatable,
102104
{
103105
let query_response = self.make_query_response(inference_vars, answer, fulfill_cx)?;
104106
let canonical_result = self.canonicalize_response(&query_response);
@@ -108,7 +110,7 @@ impl<'cx, 'gcx, 'tcx> InferCtxt<'cx, 'gcx, 'tcx> {
108110
canonical_result
109111
);
110112

111-
Ok(Lrc::new(canonical_result))
113+
Ok(self.tcx.arena.alloc(canonical_result))
112114
}
113115

114116
/// A version of `make_canonicalized_query_response` that does

‎src/librustc/query/mod.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ rustc_queries! {
892892
query normalize_projection_ty(
893893
goal: CanonicalProjectionGoal<'tcx>
894894
) -> Result<
895-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, NormalizationResult<'tcx>>>>,
895+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, NormalizationResult<'tcx>>>,
896896
NoSolution,
897897
> {
898898
no_force
@@ -910,7 +910,7 @@ rustc_queries! {
910910
query implied_outlives_bounds(
911911
goal: CanonicalTyGoal<'tcx>
912912
) -> Result<
913-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, Vec<OutlivesBound<'tcx>>>>>,
913+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, Vec<OutlivesBound<'tcx>>>>,
914914
NoSolution,
915915
> {
916916
no_force
@@ -921,7 +921,7 @@ rustc_queries! {
921921
query dropck_outlives(
922922
goal: CanonicalTyGoal<'tcx>
923923
) -> Result<
924-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, DropckOutlivesResult<'tcx>>>>,
924+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, DropckOutlivesResult<'tcx>>>,
925925
NoSolution,
926926
> {
927927
no_force
@@ -940,7 +940,7 @@ rustc_queries! {
940940
query evaluate_goal(
941941
goal: traits::ChalkCanonicalGoal<'tcx>
942942
) -> Result<
943-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>>,
943+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
944944
NoSolution
945945
> {
946946
no_force
@@ -951,7 +951,7 @@ rustc_queries! {
951951
query type_op_ascribe_user_type(
952952
goal: CanonicalTypeOpAscribeUserTypeGoal<'tcx>
953953
) -> Result<
954-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>>,
954+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
955955
NoSolution,
956956
> {
957957
no_force
@@ -962,7 +962,7 @@ rustc_queries! {
962962
query type_op_eq(
963963
goal: CanonicalTypeOpEqGoal<'tcx>
964964
) -> Result<
965-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>>,
965+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
966966
NoSolution,
967967
> {
968968
no_force
@@ -973,7 +973,7 @@ rustc_queries! {
973973
query type_op_subtype(
974974
goal: CanonicalTypeOpSubtypeGoal<'tcx>
975975
) -> Result<
976-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>>,
976+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
977977
NoSolution,
978978
> {
979979
no_force
@@ -984,7 +984,7 @@ rustc_queries! {
984984
query type_op_prove_predicate(
985985
goal: CanonicalTypeOpProvePredicateGoal<'tcx>
986986
) -> Result<
987-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>>,
987+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
988988
NoSolution,
989989
> {
990990
no_force
@@ -995,7 +995,7 @@ rustc_queries! {
995995
query type_op_normalize_ty(
996996
goal: CanonicalTypeOpNormalizeGoal<'tcx, Ty<'tcx>>
997997
) -> Result<
998-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, Ty<'tcx>>>>,
998+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, Ty<'tcx>>>,
999999
NoSolution,
10001000
> {
10011001
no_force
@@ -1006,7 +1006,7 @@ rustc_queries! {
10061006
query type_op_normalize_predicate(
10071007
goal: CanonicalTypeOpNormalizeGoal<'tcx, ty::Predicate<'tcx>>
10081008
) -> Result<
1009-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, ty::Predicate<'tcx>>>>,
1009+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ty::Predicate<'tcx>>>,
10101010
NoSolution,
10111011
> {
10121012
no_force
@@ -1017,7 +1017,7 @@ rustc_queries! {
10171017
query type_op_normalize_poly_fn_sig(
10181018
goal: CanonicalTypeOpNormalizeGoal<'tcx, ty::PolyFnSig<'tcx>>
10191019
) -> Result<
1020-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, ty::PolyFnSig<'tcx>>>>,
1020+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ty::PolyFnSig<'tcx>>>,
10211021
NoSolution,
10221022
> {
10231023
no_force
@@ -1028,7 +1028,7 @@ rustc_queries! {
10281028
query type_op_normalize_fn_sig(
10291029
goal: CanonicalTypeOpNormalizeGoal<'tcx, ty::FnSig<'tcx>>
10301030
) -> Result<
1031-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, ty::FnSig<'tcx>>>>,
1031+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ty::FnSig<'tcx>>>,
10321032
NoSolution,
10331033
> {
10341034
no_force

‎src/librustc_traits/chalk_context/mod.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ use rustc::ty::{self, TyCtxt, InferConst};
3636
use rustc::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
3737
use rustc::ty::query::Providers;
3838
use rustc::ty::subst::{Kind, UnpackedKind};
39-
use rustc_data_structures::sync::Lrc;
4039
use rustc::mir::interpret::ConstValue;
4140
use syntax_pos::DUMMY_SP;
4241

@@ -677,7 +676,7 @@ crate fn evaluate_goal<'a, 'tcx>(
677676
tcx: TyCtxt<'a, 'tcx, 'tcx>,
678677
goal: ChalkCanonicalGoal<'tcx>
679678
) -> Result<
680-
Lrc<Canonical<'tcx, QueryResponse<'tcx, ()>>>,
679+
&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>,
681680
traits::query::NoSolution
682681
> {
683682
use crate::lowering::Lower;
@@ -718,6 +717,6 @@ crate fn evaluate_goal<'a, 'tcx>(
718717

719718
debug!("evaluate_goal: solution = {:?}", solution);
720719

721-
solution.map(|ok| Ok(Lrc::new(ok)))
722-
.unwrap_or(Err(traits::query::NoSolution))
720+
solution.map(|ok| Ok(&*tcx.arena.alloc(ok)))
721+
.unwrap_or(Err(traits::query::NoSolution))
723722
}

‎src/librustc_traits/dropck_outlives.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use rustc::ty::query::Providers;
77
use rustc::ty::subst::{Subst, InternalSubsts};
88
use rustc::ty::{self, ParamEnvAnd, Ty, TyCtxt};
99
use rustc::util::nodemap::FxHashSet;
10-
use rustc_data_structures::sync::Lrc;
1110
use syntax::source_map::{Span, DUMMY_SP};
1211

1312
crate fn provide(p: &mut Providers<'_>) {
@@ -21,7 +20,7 @@ crate fn provide(p: &mut Providers<'_>) {
2120
fn dropck_outlives<'tcx>(
2221
tcx: TyCtxt<'_, 'tcx, 'tcx>,
2322
canonical_goal: CanonicalTyGoal<'tcx>,
24-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, DropckOutlivesResult<'tcx>>>>, NoSolution> {
23+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, DropckOutlivesResult<'tcx>>>, NoSolution> {
2524
debug!("dropck_outlives(goal={:#?})", canonical_goal);
2625

2726
tcx.infer_ctxt().enter_with_canonical(

‎src/librustc_traits/implied_outlives_bounds.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ use smallvec::{SmallVec, smallvec};
1515
use syntax::source_map::DUMMY_SP;
1616
use rustc::traits::FulfillmentContext;
1717

18-
use rustc_data_structures::sync::Lrc;
19-
2018
crate fn provide(p: &mut Providers<'_>) {
2119
*p = Providers {
2220
implied_outlives_bounds,
@@ -28,7 +26,7 @@ fn implied_outlives_bounds<'tcx>(
2826
tcx: TyCtxt<'_, 'tcx, 'tcx>,
2927
goal: CanonicalTyGoal<'tcx>,
3028
) -> Result<
31-
Lrc<Canonical<'tcx, canonical::QueryResponse<'tcx, Vec<OutlivesBound<'tcx>>>>>,
29+
&'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, Vec<OutlivesBound<'tcx>>>>,
3230
NoSolution,
3331
> {
3432
tcx.infer_ctxt()

‎src/librustc_traits/normalize_projection_ty.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use rustc::traits::query::{normalize::NormalizationResult, CanonicalProjectionGo
44
use rustc::traits::{self, ObligationCause, SelectionContext, TraitEngineExt};
55
use rustc::ty::query::Providers;
66
use rustc::ty::{ParamEnvAnd, TyCtxt};
7-
use rustc_data_structures::sync::Lrc;
87
use std::sync::atomic::Ordering;
98
use syntax_pos::DUMMY_SP;
109

@@ -18,7 +17,7 @@ crate fn provide(p: &mut Providers<'_>) {
1817
fn normalize_projection_ty<'tcx>(
1918
tcx: TyCtxt<'_, 'tcx, 'tcx>,
2019
goal: CanonicalProjectionGoal<'tcx>,
21-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, NormalizationResult<'tcx>>>>, NoSolution> {
20+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, NormalizationResult<'tcx>>>, NoSolution> {
2221
debug!("normalize_provider(goal={:#?})", goal);
2322

2423
tcx.sess

‎src/librustc_traits/type_op.rs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use rustc::ty::subst::{Kind, Subst, UserSubsts, UserSelfTy};
1717
use rustc::ty::{
1818
FnSig, Lift, ParamEnv, ParamEnvAnd, PolyFnSig, Predicate, Ty, TyCtxt, TypeFoldable, Variance,
1919
};
20-
use rustc_data_structures::sync::Lrc;
2120
use std::fmt;
2221
use syntax_pos::DUMMY_SP;
2322

@@ -38,7 +37,7 @@ crate fn provide(p: &mut Providers<'_>) {
3837
fn type_op_ascribe_user_type<'tcx>(
3938
tcx: TyCtxt<'_, 'tcx, 'tcx>,
4039
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, AscribeUserType<'tcx>>>,
41-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, ()>>>, NoSolution> {
40+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>, NoSolution> {
4241
tcx.infer_ctxt()
4342
.enter_canonical_trait_query(&canonicalized, |infcx, fulfill_cx, key| {
4443
let (
@@ -170,7 +169,7 @@ impl AscribeUserTypeCx<'me, 'gcx, 'tcx> {
170169
fn type_op_eq<'tcx>(
171170
tcx: TyCtxt<'_, 'tcx, 'tcx>,
172171
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Eq<'tcx>>>,
173-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, ()>>>, NoSolution> {
172+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>, NoSolution> {
174173
tcx.infer_ctxt()
175174
.enter_canonical_trait_query(&canonicalized, |infcx, fulfill_cx, key| {
176175
let (param_env, Eq { a, b }) = key.into_parts();
@@ -200,39 +199,39 @@ where
200199
fn type_op_normalize_ty(
201200
tcx: TyCtxt<'_, 'tcx, 'tcx>,
202201
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Normalize<Ty<'tcx>>>>,
203-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, Ty<'tcx>>>>, NoSolution> {
202+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, Ty<'tcx>>>, NoSolution> {
204203
tcx.infer_ctxt()
205204
.enter_canonical_trait_query(&canonicalized, type_op_normalize)
206205
}
207206

208207
fn type_op_normalize_predicate(
209208
tcx: TyCtxt<'_, 'tcx, 'tcx>,
210209
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Normalize<Predicate<'tcx>>>>,
211-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, Predicate<'tcx>>>>, NoSolution> {
210+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, Predicate<'tcx>>>, NoSolution> {
212211
tcx.infer_ctxt()
213212
.enter_canonical_trait_query(&canonicalized, type_op_normalize)
214213
}
215214

216215
fn type_op_normalize_fn_sig(
217216
tcx: TyCtxt<'_, 'tcx, 'tcx>,
218217
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Normalize<FnSig<'tcx>>>>,
219-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, FnSig<'tcx>>>>, NoSolution> {
218+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, FnSig<'tcx>>>, NoSolution> {
220219
tcx.infer_ctxt()
221220
.enter_canonical_trait_query(&canonicalized, type_op_normalize)
222221
}
223222

224223
fn type_op_normalize_poly_fn_sig(
225224
tcx: TyCtxt<'_, 'tcx, 'tcx>,
226225
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Normalize<PolyFnSig<'tcx>>>>,
227-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, PolyFnSig<'tcx>>>>, NoSolution> {
226+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, PolyFnSig<'tcx>>>, NoSolution> {
228227
tcx.infer_ctxt()
229228
.enter_canonical_trait_query(&canonicalized, type_op_normalize)
230229
}
231230

232231
fn type_op_subtype<'tcx>(
233232
tcx: TyCtxt<'_, 'tcx, 'tcx>,
234233
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, Subtype<'tcx>>>,
235-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, ()>>>, NoSolution> {
234+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>, NoSolution> {
236235
tcx.infer_ctxt()
237236
.enter_canonical_trait_query(&canonicalized, |infcx, fulfill_cx, key| {
238237
let (param_env, Subtype { sub, sup }) = key.into_parts();
@@ -246,7 +245,7 @@ fn type_op_subtype<'tcx>(
246245
fn type_op_prove_predicate<'tcx>(
247246
tcx: TyCtxt<'_, 'tcx, 'tcx>,
248247
canonicalized: Canonical<'tcx, ParamEnvAnd<'tcx, ProvePredicate<'tcx>>>,
249-
) -> Result<Lrc<Canonical<'tcx, QueryResponse<'tcx, ()>>>, NoSolution> {
248+
) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>, NoSolution> {
250249
tcx.infer_ctxt()
251250
.enter_canonical_trait_query(&canonicalized, |infcx, fulfill_cx, key| {
252251
let (param_env, ProvePredicate { predicate }) = key.into_parts();

0 commit comments

Comments
 (0)