Skip to content

Commit c80459b

Browse files
lcnrlcnr
committed
change HIR typeck unification handling approach
1 parent 922958c commit c80459b

File tree

25 files changed

+168
-106
lines changed

25 files changed

+168
-106
lines changed

‎compiler/rustc_borrowck/src/region_infer/opaque_types/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,7 @@ fn apply_computed_concrete_opaque_types<'tcx>(
532532
let locations = Locations::All(hidden_type.span);
533533
if let Err(guar) = fully_perform_op_raw(
534534
infcx,
535+
root_cx.root_def_id(),
535536
body,
536537
universal_regions,
537538
region_bound_pairs,

‎compiler/rustc_borrowck/src/root_cx.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ impl<'tcx> BorrowCheckRootCtxt<'tcx> {
3838
}
3939
}
4040

41+
pub(super) fn root_def_id(&self) -> LocalDefId {
42+
self.root_def_id
43+
}
44+
4145
/// Collect all defining uses of opaque types inside of this typeck root. This
4246
/// expects the hidden type to be mapped to the definition parameters of the opaque
4347
/// and errors if we end up with distinct hidden types.

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use std::fmt;
22

33
use rustc_errors::ErrorGuaranteed;
4+
use rustc_hir::def_id::LocalDefId;
45
use rustc_infer::infer::canonical::Canonical;
56
use rustc_infer::infer::outlives::env::RegionBoundPairs;
67
use rustc_middle::bug;
@@ -23,6 +24,7 @@ use crate::universal_regions::UniversalRegions;
2324
#[instrument(skip(infcx, constraints, op), level = "trace")]
2425
pub(crate) fn fully_perform_op_raw<'tcx, R: fmt::Debug, Op>(
2526
infcx: &BorrowckInferCtxt<'tcx>,
27+
root_def_id: LocalDefId,
2628
body: &Body<'tcx>,
2729
universal_regions: &UniversalRegions<'tcx>,
2830
region_bound_pairs: &RegionBoundPairs<'tcx>,
@@ -39,7 +41,7 @@ where
3941
let old_universe = infcx.universe();
4042

4143
let TypeOpOutput { output, constraints: query_constraints, error_info } =
42-
op.fully_perform(infcx, locations.span(body))?;
44+
op.fully_perform(infcx, root_def_id, locations.span(body))?;
4345
if cfg!(debug_assertions) {
4446
let data = infcx.take_and_reset_region_constraints();
4547
if !data.is_empty() {
@@ -52,6 +54,7 @@ where
5254
if let Some(data) = query_constraints {
5355
constraint_conversion::ConstraintConversion::new(
5456
infcx,
57+
root_def_id,
5558
universal_regions,
5659
region_bound_pairs,
5760
infcx.param_env,
@@ -103,6 +106,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
103106
{
104107
fully_perform_op_raw(
105108
self.infcx,
109+
self.root_cx.root_def_id(),
106110
self.body,
107111
self.universal_regions,
108112
self.region_bound_pairs,

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use crate::{ClosureOutlivesSubject, ClosureRegionRequirements, ConstraintCategor
2222

2323
pub(crate) struct ConstraintConversion<'a, 'tcx> {
2424
infcx: &'a InferCtxt<'tcx>,
25+
root_def_id: LocalDefId,
2526
universal_regions: &'a UniversalRegions<'tcx>,
2627
/// Each RBP `GK: 'a` is assumed to be true. These encode
2728
/// relationships like `T: 'a` that are added via implicit bounds
@@ -46,6 +47,7 @@ pub(crate) struct ConstraintConversion<'a, 'tcx> {
4647
impl<'a, 'tcx> ConstraintConversion<'a, 'tcx> {
4748
pub(crate) fn new(
4849
infcx: &'a InferCtxt<'tcx>,
50+
root_def_id: LocalDefId,
4951
universal_regions: &'a UniversalRegions<'tcx>,
5052
region_bound_pairs: &'a RegionBoundPairs<'tcx>,
5153
param_env: ty::ParamEnv<'tcx>,
@@ -57,6 +59,7 @@ impl<'a, 'tcx> ConstraintConversion<'a, 'tcx> {
5759
) -> Self {
5860
Self {
5961
infcx,
62+
root_def_id,
6063
universal_regions,
6164
region_bound_pairs,
6265
param_env,
@@ -286,8 +289,11 @@ impl<'a, 'tcx> ConstraintConversion<'a, 'tcx> {
286289
ConstraintCategory<'tcx>,
287290
)>,
288291
) -> Ty<'tcx> {
289-
match self.param_env.and(DeeplyNormalize { value: ty }).fully_perform(self.infcx, self.span)
290-
{
292+
match self.param_env.and(DeeplyNormalize { value: ty }).fully_perform(
293+
self.infcx,
294+
self.root_def_id,
295+
self.span,
296+
) {
291297
Ok(TypeOpOutput { output: ty, constraints, .. }) => {
292298
// FIXME(higher_ranked_auto): What should we do with the assumptions here?
293299
if let Some(QueryRegionConstraints { outlives, assumptions: _ }) = constraints {

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use rustc_data_structures::frozen::Frozen;
22
use rustc_data_structures::transitive_relation::{TransitiveRelation, TransitiveRelationBuilder};
33
use rustc_hir::def::DefKind;
4+
use rustc_hir::def_id::LocalDefId;
45
use rustc_infer::infer::canonical::QueryRegionConstraints;
56
use rustc_infer::infer::outlives::env::RegionBoundPairs;
67
use rustc_infer::infer::region_constraints::GenericKind;
@@ -48,12 +49,14 @@ pub(crate) struct CreateResult<'tcx> {
4849

4950
pub(crate) fn create<'tcx>(
5051
infcx: &InferCtxt<'tcx>,
52+
root_def_id: LocalDefId,
5153
param_env: ty::ParamEnv<'tcx>,
5254
universal_regions: UniversalRegions<'tcx>,
5355
constraints: &mut MirTypeckRegionConstraints<'tcx>,
5456
) -> CreateResult<'tcx> {
5557
UniversalRegionRelationsBuilder {
5658
infcx,
59+
root_def_id,
5760
param_env,
5861
constraints,
5962
universal_regions,
@@ -178,6 +181,7 @@ impl UniversalRegionRelations<'_> {
178181

179182
struct UniversalRegionRelationsBuilder<'a, 'tcx> {
180183
infcx: &'a InferCtxt<'tcx>,
184+
root_def_id: LocalDefId,
181185
param_env: ty::ParamEnv<'tcx>,
182186
universal_regions: UniversalRegions<'tcx>,
183187
constraints: &'a mut MirTypeckRegionConstraints<'tcx>,
@@ -263,7 +267,7 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
263267
let TypeOpOutput { output: norm_ty, constraints: constraints_normalize, .. } =
264268
param_env
265269
.and(DeeplyNormalize { value: ty })
266-
.fully_perform(self.infcx, span)
270+
.fully_perform(self.infcx, self.root_def_id, span)
267271
.unwrap_or_else(|guar| TypeOpOutput {
268272
output: Ty::new_error(self.infcx.tcx, guar),
269273
constraints: None,
@@ -298,8 +302,9 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
298302
// Add implied bounds from impl header.
299303
if matches!(tcx.def_kind(defining_ty_def_id), DefKind::AssocFn | DefKind::AssocConst) {
300304
for &(ty, _) in tcx.assumed_wf_types(tcx.local_parent(defining_ty_def_id)) {
301-
let result: Result<_, ErrorGuaranteed> =
302-
param_env.and(DeeplyNormalize { value: ty }).fully_perform(self.infcx, span);
305+
let result: Result<_, ErrorGuaranteed> = param_env
306+
.and(DeeplyNormalize { value: ty })
307+
.fully_perform(self.infcx, self.root_def_id, span);
303308
let Ok(TypeOpOutput { output: norm_ty, constraints: c, .. }) = result else {
304309
continue;
305310
};
@@ -316,6 +321,7 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
316321
for c in constraints {
317322
constraint_conversion::ConstraintConversion::new(
318323
self.infcx,
324+
self.root_def_id,
319325
&self.universal_regions,
320326
&self.region_bound_pairs,
321327
param_env,
@@ -353,10 +359,11 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
353359
output: normalized_outlives,
354360
constraints: constraints_normalize,
355361
error_info: _,
356-
}) = self
357-
.param_env
358-
.and(DeeplyNormalize { value: outlives })
359-
.fully_perform(self.infcx, span)
362+
}) = self.param_env.and(DeeplyNormalize { value: outlives }).fully_perform(
363+
self.infcx,
364+
self.root_def_id,
365+
span,
366+
)
360367
else {
361368
self.infcx.dcx().delayed_bug(format!("could not normalize {outlives:?}"));
362369
return;
@@ -383,7 +390,7 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
383390
let TypeOpOutput { output: bounds, constraints, .. } = self
384391
.param_env
385392
.and(type_op::ImpliedOutlivesBounds { ty })
386-
.fully_perform(self.infcx, span)
393+
.fully_perform(self.infcx, self.root_def_id, span)
387394
.map_err(|_: ErrorGuaranteed| debug!("failed to compute implied bounds {:?}", ty))
388395
.ok()?;
389396
debug!(?bounds, ?constraints);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ impl<'tcx> LivenessContext<'_, '_, 'tcx> {
640640

641641
let op = typeck.infcx.param_env.and(DropckOutlives { dropped_ty });
642642

643-
match op.fully_perform(typeck.infcx, DUMMY_SP) {
643+
match op.fully_perform(typeck.infcx, typeck.root_cx.root_def_id(), DUMMY_SP) {
644644
Ok(TypeOpOutput { output, constraints, .. }) => {
645645
DropData { dropck_result: output, region_constraint_data: constraints }
646646
}

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

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,13 @@ pub(crate) fn type_check<'tcx>(
120120
region_bound_pairs,
121121
normalized_inputs_and_output,
122122
known_type_outlives_obligations,
123-
} = free_region_relations::create(infcx, infcx.param_env, universal_regions, &mut constraints);
123+
} = free_region_relations::create(
124+
infcx,
125+
root_cx.root_def_id(),
126+
infcx.param_env,
127+
universal_regions,
128+
&mut constraints,
129+
);
124130

125131
let pre_obligations = infcx.take_registered_region_obligations();
126132
assert!(
@@ -406,6 +412,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
406412

407413
constraint_conversion::ConstraintConversion::new(
408414
self.infcx,
415+
self.root_cx.root_def_id(),
409416
self.universal_regions,
410417
self.region_bound_pairs,
411418
self.infcx.param_env,
@@ -2458,9 +2465,11 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
24582465
args: GenericArgsRef<'tcx>,
24592466
locations: Locations,
24602467
) -> ty::InstantiatedPredicates<'tcx> {
2468+
let root_def_id = self.root_cx.root_def_id();
24612469
if let Some(closure_requirements) = &self.root_cx.closure_requirements(def_id) {
24622470
constraint_conversion::ConstraintConversion::new(
24632471
self.infcx,
2472+
root_def_id,
24642473
self.universal_regions,
24652474
self.region_bound_pairs,
24662475
self.infcx.param_env,
@@ -2473,9 +2482,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
24732482
.apply_closure_requirements(closure_requirements, def_id, args);
24742483
}
24752484

2476-
// Now equate closure args to regions inherited from `typeck_root_def_id`. Fixes #98589.
2477-
let typeck_root_def_id = tcx.typeck_root_def_id(self.body.source.def_id());
2478-
let typeck_root_args = ty::GenericArgs::identity_for_item(tcx, typeck_root_def_id);
2485+
// Now equate closure args to regions inherited from `root_def_id`. Fixes #98589.
2486+
let typeck_root_args = ty::GenericArgs::identity_for_item(tcx, root_def_id);
24792487

24802488
let parent_args = match tcx.def_kind(def_id) {
24812489
// We don't want to dispatch on 3 different kind of closures here, so take
@@ -2550,17 +2558,14 @@ impl<'tcx> TypeOp<'tcx> for InstantiateOpaqueType<'tcx> {
25502558
fn fully_perform(
25512559
mut self,
25522560
infcx: &InferCtxt<'tcx>,
2561+
root_def_id: LocalDefId,
25532562
span: Span,
25542563
) -> Result<TypeOpOutput<'tcx, Self>, ErrorGuaranteed> {
2555-
let (mut output, region_constraints) = scrape_region_constraints(
2556-
infcx,
2557-
|ocx| {
2564+
let (mut output, region_constraints) =
2565+
scrape_region_constraints(infcx, root_def_id, "InstantiateOpaqueType", span, |ocx| {
25582566
ocx.register_obligations(self.obligations.clone());
25592567
Ok(())
2560-
},
2561-
"InstantiateOpaqueType",
2562-
span,
2563-
)?;
2568+
})?;
25642569
self.region_constraints = Some(region_constraints);
25652570
output.error_info = Some(self);
25662571
Ok(output)

‎compiler/rustc_hir_analysis/src/check/check.rs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2053,3 +2053,29 @@ pub(super) fn check_coroutine_obligations(
20532053

20542054
Ok(())
20552055
}
2056+
2057+
pub(super) fn check_potentially_region_dependent_goals<'tcx>(
2058+
tcx: TyCtxt<'tcx>,
2059+
def_id: LocalDefId,
2060+
) -> Result<(), ErrorGuaranteed> {
2061+
if !tcx.next_trait_solver_globally() {
2062+
return Ok(());
2063+
}
2064+
let typeck_results = tcx.typeck(def_id);
2065+
let param_env = tcx.param_env(def_id);
2066+
2067+
// We use `TypingMode::Borrowck` as we want to use the opaque types computed by HIR typeck.
2068+
let typing_mode = TypingMode::borrowck(tcx, def_id);
2069+
let infcx = tcx.infer_ctxt().ignoring_regions().build(typing_mode);
2070+
let ocx = ObligationCtxt::new_with_diagnostics(&infcx);
2071+
for (predicate, cause) in &typeck_results.potentially_region_dependent_goals {
2072+
let predicate = fold_regions(tcx, *predicate, |_, _| {
2073+
infcx.next_region_var(RegionVariableOrigin::Misc(cause.span))
2074+
});
2075+
ocx.register_obligation(Obligation::new(tcx, cause.clone(), param_env, predicate));
2076+
}
2077+
2078+
let errors = ocx.select_all_or_error();
2079+
debug!(?errors);
2080+
if errors.is_empty() { Ok(()) } else { Err(infcx.err_ctxt().report_fulfillment_errors(errors)) }
2081+
}

‎compiler/rustc_hir_analysis/src/check/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ pub(super) fn provide(providers: &mut Providers) {
109109
collect_return_position_impl_trait_in_trait_tys,
110110
compare_impl_item: compare_impl_item::compare_impl_item,
111111
check_coroutine_obligations: check::check_coroutine_obligations,
112+
check_potentially_region_dependent_goals: check::check_potentially_region_dependent_goals,
112113
check_type_wf: wfcheck::check_type_wf,
113114
check_well_formed: wfcheck::check_well_formed,
114115
..*providers

‎compiler/rustc_hir_typeck/src/lib.rs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ use rustc_hir_analysis::check::{check_abi, check_custom_abi};
5353
use rustc_hir_analysis::hir_ty_lowering::HirTyLowerer;
5454
use rustc_infer::traits::{ObligationCauseCode, ObligationInspector, WellFormedLoc};
5555
use rustc_middle::query::Providers;
56-
use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt};
56+
use rustc_middle::ty::{self, Ty, TyCtxt};
5757
use rustc_middle::{bug, span_bug};
5858
use rustc_session::config;
5959
use rustc_span::Span;
@@ -259,21 +259,6 @@ fn typeck_with_inspect<'tcx>(
259259

260260
let typeck_results = fcx.resolve_type_vars_in_body(body);
261261

262-
// Handle potentially region dependent goals, see `InferCtxt::in_hir_typeck`.
263-
if let None = fcx.infcx.tainted_by_errors() {
264-
for obligation in fcx.take_hir_typeck_potentially_region_dependent_goals() {
265-
let obligation = fcx.resolve_vars_if_possible(obligation);
266-
if obligation.has_non_region_infer() {
267-
bug!("unexpected inference variable after writeback: {obligation:?}");
268-
}
269-
fcx.register_predicate(obligation);
270-
}
271-
fcx.select_obligations_where_possible(|_| {});
272-
if let None = fcx.infcx.tainted_by_errors() {
273-
fcx.report_ambiguity_errors();
274-
}
275-
}
276-
277262
fcx.detect_opaque_types_added_during_writeback();
278263

279264
// Consistency check our TypeckResults instance can hold all ItemLocalIds

0 commit comments

Comments
 (0)