-
Notifications
You must be signed in to change notification settings - Fork 10.5k
[C++-Interop] Fix EffectiveClangContext for NS_OPTIONS EnumDecl lookup. #59042
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
// Enum usage that is bitwise-able and assignable in C++, aka how CF_OPTIONS | ||
// does things. | ||
|
||
#if __has_attribute(enum_extensibility) | ||
#define __CF_ENUM_ATTRIBUTES __attribute__((enum_extensibility(open))) | ||
#define __CF_CLOSED_ENUM_ATTRIBUTES __attribute__((enum_extensibility(closed))) | ||
#define __CF_OPTIONS_ATTRIBUTES __attribute__((flag_enum,enum_extensibility(open))) | ||
#else | ||
#define __CF_ENUM_ATTRIBUTES | ||
#define __CF_CLOSED_ENUM_ATTRIBUTES | ||
#define __CF_OPTIONS_ATTRIBUTES | ||
#endif | ||
|
||
// explicitly use extern "C" rather than setting it in the modulemap file as | ||
// would be the case with Foundation's modulemap. | ||
extern "C" { | ||
|
||
#define CF_OPTIONS(_type, _name) _type __attribute__((availability(swift, unavailable))) _name; enum __CF_OPTIONS_ATTRIBUTES : _name | ||
#define NS_OPTIONS(_type, _name) CF_OPTIONS(_type, _name) | ||
|
||
typedef unsigned long NSUInteger; | ||
|
||
typedef NS_OPTIONS(NSUInteger, NSBinarySearchingOptions) { | ||
NSBinarySearchingFirstEqual = (1UL << 8), | ||
NSBinarySearchingLastEqual = (1UL << 9), | ||
NSBinarySearchingInsertionIndex = (1UL << 10), | ||
}; | ||
|
||
} |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
// RUN: %target-swift-ide-test -print-module -module-to-print=CenumsNSOptions -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s | ||
// REQUIRES: objc_interop | ||
|
||
import CenumsNSOptions | ||
|
||
// CHECK: typealias NSBinarySearchingOptions = UInt | ||
// CHECK-NEXT: struct NSBinarySearchingOptions : OptionSet, @unchecked Sendable { | ||
// CHECK-NEXT: init(rawValue: UInt) | ||
// CHECK-NEXT: let rawValue: UInt | ||
// CHECK-NEXT: typealias RawValue = UInt | ||
// CHECK-NEXT: typealias Element = NSBinarySearchingOptions | ||
// CHECK-NEXT: typealias ArrayLiteralElement = NSBinarySearchingOptions | ||
// CHECK-NEXT: static var firstEqual: NSBinarySearchingOptions { get } | ||
// CHECK-NEXT: @available(swift, obsoleted: 3, renamed: "firstEqual") | ||
// CHECK-NEXT: static var FirstEqual: NSBinarySearchingOptions { get } | ||
// CHECK-NEXT: static var lastEqual: NSBinarySearchingOptions { get } | ||
// CHECK-NEXT: @available(swift, obsoleted: 3, renamed: "lastEqual") | ||
// CHECK-NEXT: static var LastEqual: NSBinarySearchingOptions { get } | ||
// CHECK-NEXT: static var insertionIndex: NSBinarySearchingOptions { get } | ||
// CHECK-NEXT: @available(swift, obsoleted: 3, renamed: "insertionIndex") | ||
// CHECK-NEXT: static var InsertionIndex: NSBinarySearchingOptions { get } | ||
// CHECK-NEXT: } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor: if we are editing around here, this line can be removed.
(sorry for reviewing late)