Skip to content

Commit 07e00c4

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#131748
Rollup merge of rust-lang#131748 - lcnr:typing-mode, r=compiler-errors cleanup canonical queries best reviewed commit by commit. adding `CanonicalQueryInput` to stop returning `defining_opaque_types` in query responses is the most involved change here. r? ``@compiler-errors``
2 parents 06d261d + 6cf4cb8 commit 07e00c4

39 files changed

+225
-261
lines changed

‎compiler/rustc_borrowck/src/diagnostics/bound_region_errors.rs

+14-15
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ use std::rc::Rc;
33

44
use rustc_errors::Diag;
55
use rustc_hir::def_id::LocalDefId;
6-
use rustc_infer::infer::canonical::Canonical;
6+
use rustc_infer::infer::canonical::CanonicalQueryInput;
77
use rustc_infer::infer::region_constraints::{Constraint, RegionConstraintData};
88
use rustc_infer::infer::{
99
InferCtxt, RegionResolutionError, RegionVariableOrigin, SubregionOrigin, TyCtxtInferExt as _,
1010
};
1111
use rustc_infer::traits::ObligationCause;
12+
use rustc_infer::traits::query::{
13+
CanonicalTypeOpAscribeUserTypeGoal, CanonicalTypeOpNormalizeGoal,
14+
CanonicalTypeOpProvePredicateGoal,
15+
};
1216
use rustc_middle::ty::error::TypeError;
1317
use rustc_middle::ty::{
1418
self, RePlaceholder, Region, RegionVid, Ty, TyCtxt, TypeFoldable, UniverseIndex,
@@ -95,9 +99,7 @@ impl<'tcx> ToUniverseInfo<'tcx> for crate::type_check::InstantiateOpaqueType<'tc
9599
}
96100
}
97101

98-
impl<'tcx> ToUniverseInfo<'tcx>
99-
for Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::prove_predicate::ProvePredicate<'tcx>>>
100-
{
102+
impl<'tcx> ToUniverseInfo<'tcx> for CanonicalTypeOpProvePredicateGoal<'tcx> {
101103
fn to_universe_info(self, base_universe: ty::UniverseIndex) -> UniverseInfo<'tcx> {
102104
UniverseInfo(UniverseInfoInner::TypeOp(Rc::new(PredicateQuery {
103105
canonical_query: self,
@@ -107,7 +109,7 @@ impl<'tcx> ToUniverseInfo<'tcx>
107109
}
108110

109111
impl<'tcx, T: Copy + fmt::Display + TypeFoldable<TyCtxt<'tcx>> + 'tcx> ToUniverseInfo<'tcx>
110-
for Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::Normalize<T>>>
112+
for CanonicalTypeOpNormalizeGoal<'tcx, T>
111113
{
112114
fn to_universe_info(self, base_universe: ty::UniverseIndex) -> UniverseInfo<'tcx> {
113115
UniverseInfo(UniverseInfoInner::TypeOp(Rc::new(NormalizeQuery {
@@ -117,9 +119,7 @@ impl<'tcx, T: Copy + fmt::Display + TypeFoldable<TyCtxt<'tcx>> + 'tcx> ToUnivers
117119
}
118120
}
119121

120-
impl<'tcx> ToUniverseInfo<'tcx>
121-
for Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::AscribeUserType<'tcx>>>
122-
{
122+
impl<'tcx> ToUniverseInfo<'tcx> for CanonicalTypeOpAscribeUserTypeGoal<'tcx> {
123123
fn to_universe_info(self, base_universe: ty::UniverseIndex) -> UniverseInfo<'tcx> {
124124
UniverseInfo(UniverseInfoInner::TypeOp(Rc::new(AscribeUserTypeQuery {
125125
canonical_query: self,
@@ -128,7 +128,7 @@ impl<'tcx> ToUniverseInfo<'tcx>
128128
}
129129
}
130130

131-
impl<'tcx, F> ToUniverseInfo<'tcx> for Canonical<'tcx, type_op::custom::CustomTypeOp<F>> {
131+
impl<'tcx, F> ToUniverseInfo<'tcx> for CanonicalQueryInput<'tcx, type_op::custom::CustomTypeOp<F>> {
132132
fn to_universe_info(self, _base_universe: ty::UniverseIndex) -> UniverseInfo<'tcx> {
133133
// We can't rerun custom type ops.
134134
UniverseInfo::other()
@@ -211,16 +211,15 @@ trait TypeOpInfo<'tcx> {
211211
}
212212

213213
struct PredicateQuery<'tcx> {
214-
canonical_query:
215-
Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::prove_predicate::ProvePredicate<'tcx>>>,
214+
canonical_query: CanonicalTypeOpProvePredicateGoal<'tcx>,
216215
base_universe: ty::UniverseIndex,
217216
}
218217

219218
impl<'tcx> TypeOpInfo<'tcx> for PredicateQuery<'tcx> {
220219
fn fallback_error(&self, tcx: TyCtxt<'tcx>, span: Span) -> Diag<'tcx> {
221220
tcx.dcx().create_err(HigherRankedLifetimeError {
222221
cause: Some(HigherRankedErrorCause::CouldNotProve {
223-
predicate: self.canonical_query.value.value.predicate.to_string(),
222+
predicate: self.canonical_query.canonical.value.value.predicate.to_string(),
224223
}),
225224
span,
226225
})
@@ -253,7 +252,7 @@ impl<'tcx> TypeOpInfo<'tcx> for PredicateQuery<'tcx> {
253252
}
254253

255254
struct NormalizeQuery<'tcx, T> {
256-
canonical_query: Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::Normalize<T>>>,
255+
canonical_query: CanonicalTypeOpNormalizeGoal<'tcx, T>,
257256
base_universe: ty::UniverseIndex,
258257
}
259258

@@ -264,7 +263,7 @@ where
264263
fn fallback_error(&self, tcx: TyCtxt<'tcx>, span: Span) -> Diag<'tcx> {
265264
tcx.dcx().create_err(HigherRankedLifetimeError {
266265
cause: Some(HigherRankedErrorCause::CouldNotNormalize {
267-
value: self.canonical_query.value.value.value.to_string(),
266+
value: self.canonical_query.canonical.value.value.value.to_string(),
268267
}),
269268
span,
270269
})
@@ -306,7 +305,7 @@ where
306305
}
307306

308307
struct AscribeUserTypeQuery<'tcx> {
309-
canonical_query: Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::AscribeUserType<'tcx>>>,
308+
canonical_query: CanonicalTypeOpAscribeUserTypeGoal<'tcx>,
310309
base_universe: ty::UniverseIndex,
311310
}
312311

‎compiler/rustc_borrowck/src/type_check/canonical.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
137137
let _: Result<_, ErrorGuaranteed> = self.fully_perform_op(
138138
locations,
139139
category,
140-
param_env.and(type_op::prove_predicate::ProvePredicate::new(predicate)),
140+
param_env.and(type_op::prove_predicate::ProvePredicate { predicate }),
141141
);
142142
}
143143

@@ -162,7 +162,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
162162
let result: Result<_, ErrorGuaranteed> = self.fully_perform_op(
163163
location.to_locations(),
164164
category,
165-
param_env.and(type_op::normalize::Normalize::new(value)),
165+
param_env.and(type_op::normalize::Normalize { value }),
166166
);
167167
result.unwrap_or(value)
168168
}
@@ -223,7 +223,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
223223
let _: Result<_, ErrorGuaranteed> = self.fully_perform_op(
224224
Locations::All(span),
225225
ConstraintCategory::Boring,
226-
self.param_env.and(type_op::ascribe_user_type::AscribeUserType::new(mir_ty, user_ty)),
226+
self.param_env.and(type_op::ascribe_user_type::AscribeUserType { mir_ty, user_ty }),
227227
);
228228
}
229229

‎compiler/rustc_borrowck/src/type_check/free_region_relations.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
280280
}
281281
let TypeOpOutput { output: norm_ty, constraints: constraints_normalize, .. } = self
282282
.param_env
283-
.and(type_op::normalize::Normalize::new(ty))
283+
.and(type_op::normalize::Normalize { value: ty })
284284
.fully_perform(self.infcx, span)
285285
.unwrap_or_else(|guar| TypeOpOutput {
286286
output: Ty::new_error(self.infcx.tcx, guar),
@@ -318,7 +318,7 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
318318
for &(ty, _) in tcx.assumed_wf_types(tcx.local_parent(defining_ty_def_id)) {
319319
let result: Result<_, ErrorGuaranteed> = self
320320
.param_env
321-
.and(type_op::normalize::Normalize::new(ty))
321+
.and(type_op::normalize::Normalize { value: ty })
322322
.fully_perform(self.infcx, span);
323323
let Ok(TypeOpOutput { output: norm_ty, constraints: c, .. }) = result else {
324324
continue;
@@ -373,7 +373,7 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
373373
) -> Option<&'tcx QueryRegionConstraints<'tcx>> {
374374
let TypeOpOutput { output: bounds, constraints, .. } = self
375375
.param_env
376-
.and(type_op::implied_outlives_bounds::ImpliedOutlivesBounds { ty })
376+
.and(type_op::ImpliedOutlivesBounds { ty })
377377
.fully_perform(self.infcx, span)
378378
.map_err(|_: ErrorGuaranteed| debug!("failed to compute implied bounds {:?}", ty))
379379
.ok()?;

‎compiler/rustc_borrowck/src/type_check/liveness/trace.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ use rustc_mir_dataflow::impls::MaybeInitializedPlaces;
1111
use rustc_mir_dataflow::move_paths::{HasMoveData, MoveData, MovePathIndex};
1212
use rustc_mir_dataflow::points::{DenseLocationMap, PointIndex};
1313
use rustc_span::DUMMY_SP;
14-
use rustc_trait_selection::traits::query::type_op::outlives::DropckOutlives;
15-
use rustc_trait_selection::traits::query::type_op::{TypeOp, TypeOpOutput};
14+
use rustc_trait_selection::traits::query::type_op::{DropckOutlives, TypeOp, TypeOpOutput};
1615
use tracing::debug;
1716

1817
use crate::location::RichLocation;
@@ -632,7 +631,7 @@ impl<'tcx> LivenessContext<'_, '_, '_, 'tcx> {
632631

633632
match typeck
634633
.param_env
635-
.and(DropckOutlives::new(dropped_ty))
634+
.and(DropckOutlives { dropped_ty })
636635
.fully_perform(typeck.infcx, DUMMY_SP)
637636
{
638637
Ok(TypeOpOutput { output, constraints, .. }) => {

‎compiler/rustc_hir_typeck/src/method/probe.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
340340
OP: FnOnce(ProbeContext<'_, 'tcx>) -> Result<R, MethodError<'tcx>>,
341341
{
342342
let mut orig_values = OriginalQueryValues::default();
343-
let param_env_and_self_ty = self.canonicalize_query(
343+
let query_input = self.canonicalize_query(
344344
ParamEnvAnd { param_env: self.param_env, value: self_ty },
345345
&mut orig_values,
346346
);
347347

348348
let steps = match mode {
349-
Mode::MethodCall => self.tcx.method_autoderef_steps(param_env_and_self_ty),
349+
Mode::MethodCall => self.tcx.method_autoderef_steps(query_input),
350350
Mode::Path => self.probe(|_| {
351351
// Mode::Path - the deref steps is "trivial". This turns
352352
// our CanonicalQuery into a "trivial" QueryResponse. This
@@ -355,11 +355,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
355355

356356
let infcx = &self.infcx;
357357
let (ParamEnvAnd { param_env: _, value: self_ty }, canonical_inference_vars) =
358-
infcx.instantiate_canonical(span, &param_env_and_self_ty);
359-
debug!(
360-
"probe_op: Mode::Path, param_env_and_self_ty={:?} self_ty={:?}",
361-
param_env_and_self_ty, self_ty
362-
);
358+
infcx.instantiate_canonical(span, &query_input.canonical);
359+
debug!(?self_ty, ?query_input, "probe_op: Mode::Path");
363360
MethodAutoderefStepsResult {
364361
steps: infcx.tcx.arena.alloc_from_iter([CandidateStep {
365362
self_ty: self.make_query_response_ignoring_pending_obligations(

‎compiler/rustc_infer/src/infer/canonical/canonicalizer.rs

+8-17
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ use tracing::debug;
1717

1818
use crate::infer::InferCtxt;
1919
use crate::infer::canonical::{
20-
Canonical, CanonicalTyVarKind, CanonicalVarInfo, CanonicalVarKind, OriginalQueryValues,
20+
Canonical, CanonicalQueryInput, CanonicalTyVarKind, CanonicalVarInfo, CanonicalVarKind,
21+
OriginalQueryValues,
2122
};
2223

2324
impl<'tcx> InferCtxt<'tcx> {
@@ -40,12 +41,12 @@ impl<'tcx> InferCtxt<'tcx> {
4041
&self,
4142
value: ty::ParamEnvAnd<'tcx, V>,
4243
query_state: &mut OriginalQueryValues<'tcx>,
43-
) -> Canonical<'tcx, ty::ParamEnvAnd<'tcx, V>>
44+
) -> CanonicalQueryInput<'tcx, ty::ParamEnvAnd<'tcx, V>>
4445
where
4546
V: TypeFoldable<TyCtxt<'tcx>>,
4647
{
4748
let (param_env, value) = value.into_parts();
48-
let mut param_env = self.tcx.canonical_param_env_cache.get_or_insert(
49+
let param_env = self.tcx.canonical_param_env_cache.get_or_insert(
4950
self.tcx,
5051
param_env,
5152
query_state,
@@ -62,17 +63,16 @@ impl<'tcx> InferCtxt<'tcx> {
6263
},
6364
);
6465

65-
param_env.defining_opaque_types = self.defining_opaque_types;
66-
67-
Canonicalizer::canonicalize_with_base(
66+
let canonical = Canonicalizer::canonicalize_with_base(
6867
param_env,
6968
value,
7069
Some(self),
7170
self.tcx,
7271
&CanonicalizeAllFreeRegions,
7372
query_state,
7473
)
75-
.unchecked_map(|(param_env, value)| param_env.and(value))
74+
.unchecked_map(|(param_env, value)| param_env.and(value));
75+
CanonicalQueryInput { canonical, defining_opaque_types: self.defining_opaque_types() }
7676
}
7777

7878
/// Canonicalizes a query *response* `V`. When we canonicalize a
@@ -544,7 +544,6 @@ impl<'cx, 'tcx> Canonicalizer<'cx, 'tcx> {
544544
max_universe: ty::UniverseIndex::ROOT,
545545
variables: List::empty(),
546546
value: (),
547-
defining_opaque_types: infcx.map(|i| i.defining_opaque_types).unwrap_or_default(),
548547
};
549548
Canonicalizer::canonicalize_with_base(
550549
base,
@@ -614,15 +613,7 @@ impl<'cx, 'tcx> Canonicalizer<'cx, 'tcx> {
614613
.max()
615614
.unwrap_or(ty::UniverseIndex::ROOT);
616615

617-
assert!(
618-
!infcx.is_some_and(|infcx| infcx.defining_opaque_types != base.defining_opaque_types)
619-
);
620-
Canonical {
621-
max_universe,
622-
variables: canonical_variables,
623-
value: (base.value, out_value),
624-
defining_opaque_types: base.defining_opaque_types,
625-
}
616+
Canonical { max_universe, variables: canonical_variables, value: (base.value, out_value) }
626617
}
627618

628619
/// Creates a canonical variable replacing `kind` from the input,

‎compiler/rustc_infer/src/infer/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use rustc_hir as hir;
2525
use rustc_hir::def_id::{DefId, LocalDefId};
2626
use rustc_macros::extension;
2727
pub use rustc_macros::{TypeFoldable, TypeVisitable};
28-
use rustc_middle::infer::canonical::{Canonical, CanonicalVarValues};
28+
use rustc_middle::infer::canonical::{CanonicalQueryInput, CanonicalVarValues};
2929
use rustc_middle::infer::unify_key::{
3030
ConstVariableOrigin, ConstVariableValue, ConstVidKey, EffectVarValue, EffectVidKey,
3131
};
@@ -606,14 +606,14 @@ impl<'tcx> InferCtxtBuilder<'tcx> {
606606
pub fn build_with_canonical<T>(
607607
mut self,
608608
span: Span,
609-
canonical: &Canonical<'tcx, T>,
609+
input: &CanonicalQueryInput<'tcx, T>,
610610
) -> (InferCtxt<'tcx>, T, CanonicalVarValues<'tcx>)
611611
where
612612
T: TypeFoldable<TyCtxt<'tcx>>,
613613
{
614-
self.defining_opaque_types = canonical.defining_opaque_types;
614+
self.defining_opaque_types = input.defining_opaque_types;
615615
let infcx = self.build();
616-
let (value, args) = infcx.instantiate_canonical(span, canonical);
616+
let (value, args) = infcx.instantiate_canonical(span, &input.canonical);
617617
(infcx, value, args)
618618
}
619619

‎compiler/rustc_middle/src/infer/canonical.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ use crate::infer::MemberConstraint;
3434
use crate::mir::ConstraintCategory;
3535
use crate::ty::{self, GenericArg, List, Ty, TyCtxt, TypeFlags, TypeVisitableExt};
3636

37+
pub type CanonicalQueryInput<'tcx, V> = ir::CanonicalQueryInput<TyCtxt<'tcx>, V>;
3738
pub type Canonical<'tcx, V> = ir::Canonical<TyCtxt<'tcx>, V>;
3839
pub type CanonicalVarInfo<'tcx> = ir::CanonicalVarInfo<TyCtxt<'tcx>>;
3940
pub type CanonicalVarValues<'tcx> = ir::CanonicalVarValues<TyCtxt<'tcx>>;
@@ -182,7 +183,6 @@ impl<'tcx> CanonicalParamEnvCache<'tcx> {
182183
max_universe: ty::UniverseIndex::ROOT,
183184
variables: List::empty(),
184185
value: key,
185-
defining_opaque_types: ty::List::empty(),
186186
};
187187
}
188188

‎compiler/rustc_middle/src/query/keys.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_span::symbol::{Ident, Symbol};
77
use rustc_span::{DUMMY_SP, Span};
88
use rustc_target::abi;
99

10-
use crate::infer::canonical::Canonical;
10+
use crate::infer::canonical::CanonicalQueryInput;
1111
use crate::ty::fast_reject::SimplifiedType;
1212
use crate::ty::layout::{TyAndLayout, ValidityRequirement};
1313
use crate::ty::{self, GenericArg, GenericArgsRef, Ty, TyCtxt};
@@ -485,7 +485,7 @@ impl Key for Option<Symbol> {
485485

486486
/// Canonical query goals correspond to abstract trait operations that
487487
/// are not tied to any crate in particular.
488-
impl<'tcx, T: Clone> Key for Canonical<'tcx, T> {
488+
impl<'tcx, T: Clone> Key for CanonicalQueryInput<'tcx, T> {
489489
type Cache<V> = DefaultCache<Self, V>;
490490

491491
fn default_span(&self, _tcx: TyCtxt<'_>) -> Span {

0 commit comments

Comments
 (0)