🍒[cxx-interop] Import custom NS_OPTIONS correctly
#68046
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
|
@swift-ci please test |
This Objective-C method
```
- (void)stream:(NSStream *)aStream
handleEvent:(NSStreamEvent)eventCode;
```
should be imported as
```
optional func stream(
_ aStream: Stream,
handle eventCode: Stream.Event)
```
and not
```
optional func stream(
_ aStream: Stream,
handleEvent eventCode: Stream.Event)
```
in order to stay compatible with Objective-C interop mode.
rdar://113208675
(cherry picked from commit 6edde29)
This changes the heuristic that we use to detect `CF_OPTIONS`/`NS_OPTIONS` instantiations in C++ language mode. Since libraries sometimes declare custom option types that break the assumptions about the names of such types, this lifts the requirements on the type name. rdar://113524090 rdar://113279214 (cherry picked from commit 46f86f0)
(cherry picked from commit f20617b)
egorzhdan
force-pushed
the
egorzhdan/5.9-cfoptions
branch
from
3b67a17 to
7920357
Compare
|
@swift-ci please test |
DougGregor
approved these changes
Aug 23, 2023
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: This makes sure that custom types defined via
NS_OPTIONS/CF_OPTIONSmacro get imported as enums into Swift. Previously a heuristic based on the type names was used, which didn't work for all possible type names.Scope: There are multiple reports of this issue blocking adoption of C++ interop.
Risk: Low, this changes the code path that is only taken when C++ interop is enabled: without C++ interop enabled,
CF_OPTIONSexpands into a different AST subtree.Original PR: #67865
rdar://112225263