[4.2 2018-06-11] [Clang importer] Don't bridge blocks to Swift functions in ObjC generic arguments. #17261
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
…ic args. While the compiler can bridge C block types to Swift function types, the Swift runtime cannot. Don't bridge block types to Swift function types in Objective-C generic arguments, so NSArray<some-block-type> will get imported as [@convention(block) (...) -> Whatever] rather than [(...) -> Whatever] Fixes rdar://problem/40879067 in a fairly narrow way; the Clang importer's approach to adjusting types based on context needs a cleanup, but this is the safe, localized fix suitable for 4.2. (cherry picked from commit d529002)
…llectionElement. This better describes what we're importing. Also note why we need to reset to the block representation. (cherry picked from commit f595ca7)
(cherry picked from commit 1dab41c)
|
@swift-ci please test |
|
@swift-ci please nominate |
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.
Explanation: The Clang importer is importing
NSArray<some-typedef-of-a-block-type>*as a Swift array of functions that use the Swift calling convention, which is not supported by the dynamic bridging implementation. Such a type should be imported as a Swift array of block-convention functions, e.g.,[@convention(block) (...) -> ...].Scope: Affects projects that import Objective-C APIs that use types of the aforementioned form.
Risk: Low; importing these APIs with the current Swift 4.2 causes a crash in IR generation.
Testing: Compiler regression tests, including new tests
Reviewer: @jrose-apple
SR / Radar: rdar://problem/40879067