[CS] Fix key path dynamic member IUOs #28562
Merged
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
When originally implemented (a5ca6cc), we used to append the set `component` to `resolvedComponents`, however that appears to have been refactored away at some point, leaving a couple of dead assignments. Restore the old behaviour by just appending the components.
Rather than setting `baseTy` for each component, just set it for the last component in the iteration. In addition, remove the `component` variable, which no longer serves a purpose. Finally, cache all the component types at the end of the loop.
Previously we were only handling IUO unwrapping in visitKeyPathExpr, but not for callers that were building their own property and subscript components such as dynamic member lookup. Move the IUO unwrapping logic into buildKeyPath[Property/Subscript]Component, and adjust their signatures to allow them to append multiple components. Also add buildKeyPathOptionalForceComponent to allow more convenient adding of an optional force component. Resolves SR-11893.
Previously we missed caching component types in one case, and cached the wrong type in another. Make both cases use cacheExprTypes to cache the correct component types.
|
@swift-ci please test |
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.
Previously we were only handling IUO unwrapping in
visitKeyPathExpr, but not for callers that were building their own property and subscript components such as dynamic member lookup.This PR moves the IUO unwrapping logic into
buildKeyPath[Property/Subscript]Component, and adjusts their signatures to allow them to append multiple components. It also addsbuildKeyPathOptionalForceComponentto allow more convenient adding of an optional force component.Resolves SR-11893.