Do not record unresolved const vars in generator interior #104788
Merged
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
|
r? @fee1-dead (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
Some changes occurred in need_type_info.rs cc @lcnr |
fee1-dead
reviewed
Nov 25, 2022
Comment on lines
1451
to
1455
| /// Returns the first unresolved variable contained in `T`. In the | ||
| /// process of visiting `T`, this will resolve (where possible) | ||
| /// type variables in `T`, but it never constructs the final, | ||
| /// resolved type, so it's more efficient than | ||
| /// `resolve_vars_if_possible()`. | ||
| pub fn unresolved_type_vars<T>(&self, value: &T) -> Option<(Ty<'tcx>, Option<Span>)> | ||
| /// Returns the first unresolved type or const variable contained in `T`. | ||
| /// In the process of visiting `T`, this will resolve (where possible) | ||
| /// type variables in `T`, but it never constructs the final, resolved | ||
| /// type, so it's more efficient than `resolve_vars_if_possible()`. | ||
| pub fn unresolved_non_region_vars<T>(&self, value: &T) -> Option<(ty::Term<'tcx>, Option<Span>)> |
There was a problem hiding this comment.
With #101900, I think this should be called unresolved_type_or_const_vars
There was a problem hiding this comment.
Sure, though I would assume that effect vars, if they existed, would also need to be included in this, or else we'd have the same ICE
| @@ -121,33 +122,62 @@ impl<'a, 'tcx> UnresolvedTypeFinder<'a, 'tcx> { | |||
| } | |||
|
|
|||
| impl<'a, 'tcx> TypeVisitor<'tcx> for UnresolvedTypeFinder<'a, 'tcx> { | |||
compiler-errors
force-pushed
the
unresolved-ct-in-gen
branch
from
d08470f to
6210812
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 26, 2022
…llaumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#104786 (Use the power of adding helper function to simplify code w/ `Mutability`) - rust-lang#104788 (Do not record unresolved const vars in generator interior) - rust-lang#104909 (Rename `normalize_opaque_types` to `reveal_opaque_types_in_bounds`) - rust-lang#104921 (Remove unnecessary binder from `get_impl_future_output_ty`) - rust-lang#104924 (jsondoclint: Accept trait alias is places where trait expected.) - rust-lang#104928 (rustdoc: use flexbox CSS to align sidebar button instead of position) - rust-lang#104943 (jsondoclint: Handle using enum variants and glob using enums.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Don't record types in the generator interior when we see unresolved const variables.
We already do this for associated types -- this is important to avoid unresolved inference variables in the generator results during writeback, since the writeback results get stable hashed in incremental mode.
Fixes #104787