support non-defining uses of opaques in borrowck #145244
Draft
+1,229
−1,412
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-CI
lcnr
force-pushed
the
handle-opaque-types-before-region-inference
branch
from
0d7a748 to
e276bbf
Compare
lcnr
commented
Aug 11, 2025
| for error in errors { | ||
| guar = Some(match error { | ||
| DeferredOpaqueTypeError::InvalidOpaqueTypeArgs(err) => err.report(self.infcx), | ||
| DeferredOpaqueTypeError::LifetimeMismatchOpaqueParam(err) => { | ||
| self.infcx.dcx().emit_err(err) | ||
| } | ||
| DeferredOpaqueTypeError::UnexpectedHiddenRegion { |
There was a problem hiding this comment.
just moved from RegionErrorKind::UnexpectedHiddenRegion
lcnr
force-pushed
the
handle-opaque-types-before-region-inference
branch
3 times, most recently
from
14e5264 to
5536a31
Compare
This comment has been minimized.
This comment has been minimized.
lcnr
force-pushed
the
handle-opaque-types-before-region-inference
branch
from
5536a31 to
298629b
Compare
This comment has been minimized.
This comment has been minimized.
lcnr
force-pushed
the
handle-opaque-types-before-region-inference
branch
from
298629b to
9af9a2c
Compare
This comment has been minimized.
This comment has been minimized.
lcnr
changed the title
lcnr
commented
Aug 11, 2025
| // FIXME(-Znext-solver): enable this test | ||
| //@ revisions: current next | ||
| //@ ignore-compare-mode-next-solver (explicit revisions) | ||
| //@[next] compile-flags: -Znext-solver |
There was a problem hiding this comment.
idk why I've added this FIXME to these 3 tests, only one of them actually failed with the new solver before.
lcnr
commented
Aug 11, 2025
| constraints, | ||
| universal_region_relations, | ||
| location_map, | ||
| &mut opaque_types, |
lcnr
changed the title
lcnr
commented
Aug 11, 2025
| hidden_type.span, | ||
| DefiningScopeKind::MirBorrowck, | ||
| ) { | ||
| if tcx.use_typing_mode_borrowck() { |
There was a problem hiding this comment.
needs comment: a non-defining use
lcnr
commented
Aug 11, 2025
| hidden_type: OpaqueHiddenType<'tcx>, | ||
| } | ||
|
|
||
| fn collect_defining_uses<'tcx>( |
There was a problem hiding this comment.
Suggested change
| fn collect_defining_uses<'tcx>( | |
| fn compute_hidden_types<'tcx>( |
and fn apply_computed_hidden_types?
lcnr
commented
Aug 11, 2025
|
|
||
| let mut defining_uses = vec![]; | ||
| let mut errors = vec![]; | ||
| for &(opaque_type_key, hidden_type) in opaque_types { |
There was a problem hiding this comment.
move this loopy loop into collect_defining_uses sub-fn
lcnr
commented
Aug 11, 2025
| rcx.scc_values.add_region(member, min_choice_scc); | ||
| } | ||
|
|
||
| struct CollectMemberConstraintsVisitor<'a, 'b, 'tcx> { |
There was a problem hiding this comment.
equiv to existing register_member_constraints
lcnr
commented
Aug 11, 2025
| let mut decls_modulo_regions: FxIndexMap<OpaqueTypeKey<'tcx>, (OpaqueTypeKey<'tcx>, Span)> = | ||
| FxIndexMap::default(); | ||
| for &DefiningUse { opaque_type_key, ref arg_regions, hidden_type } in defining_uses { | ||
| let opaque_type_key = opaque_type_key.fold_captured_lifetime_args(infcx.tcx, |r| { |
There was a problem hiding this comment.
store non_nll_opaque_type_key in DefiningUse
lcnr
commented
Aug 11, 2025
Comment on lines
+248
to
+253
| let _span = debug_span!( | ||
| "map_defining_uses_to_definition_site", | ||
| ?opaque_type_key, | ||
| ?arg_regions, | ||
| ?hidden_type | ||
| ); |
There was a problem hiding this comment.
Suggested change
| let _span = debug_span!( | |
| "map_defining_uses_to_definition_site", | |
| ?opaque_type_key, | |
| ?arg_regions, | |
| ?hidden_type | |
| ); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reimplements the first part of #139587, but limited to only the new solver.
member_constraintsshit out of the type checker and region inference context'erasedhandlingapply_defining_usesis the thing that actually mutates the constraintsopaque_types_added_sinceadd commentcheck_opaque_type_parameter_validneeds to be renamed, it's not valid, it's defining?ToArgRegionsFoldershould be in a separate PRr? @ghost