[CSSyntaticElement] Desugar types before collecting "in scope" type v… #65048
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
…ariables Generic type aliases, unless desugared, could bring unrelated type variables into the scope i.e. `TypeAlias<$T, $U>.Context` is actually `_Context<$U>`. These variables could be inferrable only after the the body the closure is solved. To avoid that, let's adjust `TypeVariableRefFinder` to desugar types before collecting referenced type variables. Resolves: rdar://107835060
|
@swift-ci please test |
hborla
approved these changes
Apr 11, 2023
slavapestov
reviewed
Apr 11, 2023
| // For example `Typealias<$T, $U>.Context` which desugars into | ||
| // `_Context<$U>` would bring in `$T` that could be inferrable | ||
| // only after the body of the closure is solved. | ||
| type = type->getDesugaredType(); |
There was a problem hiding this comment.
I think getDesugaredType() only unwraps one level of sugar, but you might have type aliases in nested position. Maybe you should use getCanonicalType() instead? Are other callers of getTypeVariables() also affected by this? Perhaps getTypeVariables() should canonicalize the type itself first.
There was a problem hiding this comment.
Other callers of getTypeVariables() don't really care because only closures are solved in isolation.
There was a problem hiding this comment.
Indeed, getDesugaredType would only unwrap N levels of sugar if they occur in sequence... I'll switch this to getCanonicalType().
xedin
added a commit
to xedin/swift
that referenced
this pull request
Apr 11, 2023
…riables Follow-up to swiftlang#65048 `getDesugaredType` unwraps sugar types that appear in sequence, to remove sugar from nested positions we need to get a canonical type. Thanks to @slavapestov for pointing it out.
xedin
added a commit
to xedin/swift
that referenced
this pull request
Apr 11, 2023
…riables Follow-up to swiftlang#65048 `getDesugaredType` unwraps sugar types that appear in sequence, to remove sugar from nested positions we need to get a canonical type. Thanks to @slavapestov for pointing it out.
meg-gupta
pushed a commit
to meg-gupta/swift
that referenced
this pull request
Apr 14, 2023
…riables Follow-up to swiftlang#65048 `getDesugaredType` unwraps sugar types that appear in sequence, to remove sugar from nested positions we need to get a canonical type. Thanks to @slavapestov for pointing it out.
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.
…ariables
Generic type aliases, unless desugared, could bring unrelated type variables into the scope i.e.
TypeAlias<$T, $U>.Contextis actually_Context<$U>. These variables could be inferrableonly after the the body the closure is solved. To avoid that, let's adjust
TypeVariableRefFinderto desugar types before collecting referenced type variables.
Resolves: rdar://107835060