[Generics] Canonicalization in GenericSignatureBuilder and SubstitutionMap #16806
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
…aints. Concrete and superclass constraints may be written involving type parameters that are later resolved to concrete types. Perform the substitution to ensure that type equality within constraint checking accounts for other same-type constraints. Fixes assertion in rdar://problem/40428709.
When we compute a replacement type for a non-substitutable generic parameter, canonicalize the type when our generic signature is canonical. This ensures that the canonical substitution map will have canonical types for all of the replacement types… including those for non-substitutable generic parameters that aren’t part of the FoldingSet profile.
|
@swift-ci please smoke test and merge |
huonw
reviewed
May 23, 2018
| }, | ||
| [&](const Constraint<Type> &constraint) { | ||
| Type concreteType = constraint.value; | ||
|
|
||
| // If the concrete type is equivalent, the constraint is redundant. | ||
| // FIXME: Should check this constraint after substituting in the | ||
| // archetype anchors for each dependent type. | ||
| if (concreteType->isEqual(equivClass->concreteType)) |
There was a problem hiding this comment.
Why isn't this comparing to the resolved one?
There was a problem hiding this comment.
EEEP! Nice catch; I'll fix.
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.
Address two generics bugs related to canonicalization:
GenericSignatureBuilder: Canonicalize types when checking concrete and superclass constraints.SubstitutionMap: Canonicalize non-substitutable replacement types.Fixes rdar://problem/40428709