🍒[cxx-interop] Fix generated header for Swift closures using CF_OPTIONS types
#82723
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
…NS` types If a Swift class has a field, which has a closure type, which takes an instance of a `CF_OPTIONS`/`NS_OPTIONS` type as a parameter, the reverse interop logic would generate an invalid Objective-C++ header for such type. This was discovered with UIKit's `UIControlState` type, which is declared with `NS_OPTIONS` in Objective-C, then renamed to `UIControl.State` with API Notes, and then re-exported to Objective-C++ via the generated header. rdar://129622886 (cherry picked from commit e95c9ec)
|
@swift-ci please test |
Xazax-hun
approved these changes
Jul 2, 2025
DougGregor
approved these changes
Jul 2, 2025
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.
CF_OPTIONS/NS_OPTIONStype as a parameter, the reverse interop logic would generate an invalid Objective-C++ header for such type. This was discovered with UIKit'sUIControlStatetype, which is declared withNS_OPTIONSin Objective-C, then renamed toUIControl.Statewith API Notes, and then re-exported to Objective-C++ via the generated header.CF_OPTIONStypes #82691CF_OPTIONStypes which were previously mishandled.