[Runtime] Have swift_dynamicCast unwrap multiple levels of optionals in the source. #16772
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
…in the source. The real work is done in checkDynamicCastFromOptional. This code tried to unwrap the source and returned the payload on success. It only did this once, so a type like Optional<Optional<Int>> would come out as Optional<Int> and then a cast to Int would fail. This change makes checkDynamicCastFromOptional recursive, which makes it unwrap as many levels of Optional as it encounters. Fixes rdar://problem/40171034 and SR-7664.
|
@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.
The real work is done in
checkDynamicCastFromOptional. This code tried to unwrap the source and returned the payload on success. It only did this once, so a type likeOptional<Optional<Int>>would come out asOptional<Int>and then a cast to Int would fail.This change makes
checkDynamicCastFromOptionalrecursive, which makes it unwrap as many levels ofOptionalas it encounters.Fixes rdar://problem/40171034 and SR-7664.