[Archetype builder] Simplify/improve handling of typealiases in protocols #6038
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
PotentialArchetype::getNestedType() was effectively reimplementing a simplified form of mapTypeOutOfContext(), missing some cases in the process. Just use mapTypeOutOfContext() and resolveArchetype(). While here, stop re-implementing the addSameType* operations; just call them directly. With these changes, we no longer need the "typealias in protocol is too complex" diagnostic. Eliminates another use of getSelfTypeInContext().
Use them to eliminate some more instances of getSelfTypeInContext().
|
FYI @gregomni, you might be interested in this cleanup |
|
@swift-ci please smoke test and merge |
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.
PotentialArchetype::getNestedType()was effectively reimplementing asimplified form of
mapTypeOutOfContext(), missing some cases in theprocess. Just use
mapTypeOutOfContext()andresolveArchetype(). Whilehere, stop re-implementing the
addSameType*operations; just call themdirectly. With these changes, we no longer need the "typealias in
protocol is too complex" diagnostic, and a couple of crashers were fixed along the way.
My actual goal here is to kill off
DeclContext::getSelfTypeInContext(), but this turned out to be an important step along the way.