[Substitution Map] Handle substitutions of generic parameters made concrete #9106
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
|
@swift-ci please smoke test and merge |
slavapestov
reviewed
Apr 28, 2017
lib/AST/SubstitutionMap.cpp
Outdated
| if (known != subMap.end() && known->second) | ||
| return known->second; | ||
|
|
||
| // The generic parameter may have been made concrete by the generic signature, |
There was a problem hiding this comment.
Why don't we just put the concrete type in the replacement map when we build the signature?
There was a problem hiding this comment.
That would fit better with a flat array of replacement types, I guess.
There was a problem hiding this comment.
We have to do it lazily because the concrete types can end up referring to other generic type parameters. Which also means I need to deal with the recursion in ill-formed programs (hence the failures).
…ncrete. If SubstitutionMap is asked to form a substitution for a generic parameter that has been made concrete by the generic signature, substitute into the concrete type. This allows us to better deal with non-canonical types.
The replacement types in a SubstitutionMap correspond with the generic parameters of its generic signature, so replace the DenseMap storage with a flat array of Types, one element for each generic parameter.
DougGregor
force-pushed
the
sub-map-concrete-generic-params
branch
from
441194c to
6ef76a9
Compare
|
@swift-ci please smoke test and merge |
1 similar comment
|
@swift-ci please smoke test and merge |
|
@swift-ci please clean smoke test Linux |
1 similar comment
|
@swift-ci please clean 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.
If
SubstitutionMapis asked to form a substitution for a genericparameter that has been made concrete by the generic signature,
substitute into the concrete type. This allows us to better deal with
non-canonical types.
As an added bonus, flatten the storage of replacement types in
SubstitutionMap. It was aDenseMap, now make it an array.