[GSB] Reduce dependence on potential archetypes for rewrite tree #15172
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
Now that we no longer have DependentMemberTypes within the GSB that don't have associated type declarations, we can no longer fail when unpacking type into a RewritePath, so remove a bunch of optionals and null Type checks that are now superfluous.
Rather than keying the rewrite tree roots on equivalence classes, which imply a mapping through potential archetypes, key on (canonical) types that are currently the anchors of equivalence classes.
Make GenericSignatureBuilder::getCanonicalTypeParameter() independent of equivalence classes. This is primarily cleanup, because all of these equivalence-class resolution calls were actually dead from the point where we changed the key for the rewrite-roots DenseMap over to dependent types.
GenericSignatureBuilder::addSameTypeRewriteRule() was described in terms of an equivalence class and a potential archetype. Rework it in terms of two dependent types (i.e., the anchors of their equivalence classes), so we don't need to rely on the PotentialArchetype mechanism.
Same-type constraints are (still) described in terms of potential archetypes, so push the "realization" operation for potential archetypes down into the function that adds a same-type constraint between type parameters.
|
@swift-ci please smoke test and merge |
|
@swift-ci please smoke test Linux |
1 similar comment
|
@swift-ci please smoke test Linux |
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.
Clean up the term-rewriting system in the
GenericSignatureBuilderby eliminating its dependency onEquivalenceClass(and, therefore,PotentialArchetype), instead using canonical types to root the rewrite trees. This is part of the elimination of potential archetypes.