Fix solution application for keypath function subtype conversions #71737
Conversation
This file contains 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
In apple#39612 we added subtyping for keypaths-as-functions, but during application the implementation naively coerced the keypath expression itself to the inferred supertype, resulting in erroneous results. This patch updates the solution application logic to build the keypath-function conversion expression based entirely on the 'natural' keypath type, only converting to the inferred supertype at the end via the usual coerceToType machinery for function conversions.
|
@swift-ci please test |
|
@swift-ci please test source compatibility |
|
@xedin would love your eyes here when you have a chance! |
xedin
approved these changes
Feb 19, 2024
| struct Test { | ||
| var codingStack: [CodingStackEntry] | ||
| var codingPath: [any CodingKey] { codingStack.map(\.key) } | ||
| // CHECK: keypath $KeyPath<CodingStackEntry, URICoderCodingKey>, (root $CodingStackEntry; stored_property #CodingStackEntry.key : $URICoderCodingKey) |
There was a problem hiding this comment.
Let's add a test-case with optional promotion as well for completeness.
|
@swift-ci please build toolchain macOS platform |
|
@swift-ci please test macOS platform |
|
@swift-ci please test Linux platform |
|
All of the source compatibility failures are macro related, including penny-bot |
|
@xedin as in, there's an unrelated macro issue here? Or you suspect this patch is somehow interfering with macro logic? |
|
Macro issue is unrelated, I saw this happen in other PRs. |
|
@swift-ci please smoke test macOS platform |
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.
In #39612 we added subtyping for keypath-function conversions. However the implementation naively coerced the keypath expression itself to the inferred supertype, resulting in erroneous results. This patch updates the solution application logic to build the keypath-function conversion expression based entirely on the 'natural' keypath type, only converting to the inferred supertype at the end via the usual coerceToType machinery for function conversions.
Resolves #71423