[runtime] Handle same-type constraints when resolving generic params #25984
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
|
I have a bunch of tests already but what did I miss? What classes of test did I miss? |
No functionality change.
Generic parameters for a context are normally classified as "key", meaning they have actual metadata provided at runtime, or non-key, meaning they're derivable from somewhere else. However, a nested context or constrained extension can take what would be a "key" parameter in a parent context and make it non-key in a child context. This messes with the mapping between the (depth, index) representation of generic parameters and the flat list of generic arguments. Fix this by (1) consistently substituting out extension contexts with the contexts of the extended types, and (2) using the most nested context to decide which parameters are key, instead of the context a parameter was originally introduced in. Note that (1) may have problems if/when extensions start introducing their /own/ generic parameters. For now I tried to be consistent with what was there. rdar://problem/52364601
|
@swift-ci Please test |
|
Build failed |
|
Build failed |
|
@swift-ci Please test Linux |
|
Build failed |
|
@swift-ci Please test Linux |
|
I'm going to merge this as is and then test type reconstruction separately in a follow-up change (as pointed out by Slava). |
jrose-apple
added a commit
to jrose-apple/swift
that referenced
this pull request
Jul 9, 2019
[runtime] Handle same-type constraints when resolving generic params rdar://problem/52364601 (cherry picked from commit 659c497)
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.
Generic parameters for a context are normally classified as "key", meaning they have actual metadata provided at runtime, or non-key, meaning they're derivable from somewhere else. However, a nested context or constrained extension can take what would be a "key" parameter in a parent context and make it non-key in a child context. This messes with the mapping between the (depth, index) representation of generic parameters and the flat list of generic arguments. Fix this by (1) consistently substituting out extension contexts with the contexts of the extended types, and (2)
checking if a same-type constraint was (2a) newly applied in a particular context, and (2b) constrains a parent's generic parameterusing the most nested context to decide which parameters are key, instead of the context a parameter was originally introduced in.Note that this may have problems if/when extensions start introducing their own generic parameters (*cough* #25263 *cough*). For now I tried to be consistent with what was there.
rdar://problem/52364601