mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
89f8855ad6
importer::findOptionSetEnum() uses some fragile heuristics to determine
whether a typedef is involved in the construction of a CF_OPTIONS or
NS_OPTIONS type. This patch adds an explicit check that the typedef is
expanded from either of those macros, to prevent, e.g., an unavailable
NS_ENUM, from being mistakenly recognized as an NS_OPTIONS.
Note that doing this is still kind of fragile, and prevents users from
building {NS,CF}_OPTIONS with their own macros. The right thing to do is
probably specifically look for the flag_enum attribute, but that is not
currently what we're doing for reasons whose discovery is left as
an exercise to the future git archaeologist.
This patch also removes (part of) a test case that builds
a CF_OPTIONS-like type with the "SOME_OPTIONS" macro, which is no longer
supported as of this patch.
rdar://150399978
13 lines
749 B
Swift
13 lines
749 B
Swift
// RUN: %target-swift-ide-test -print-module -module-to-print=AnonymousWithSwiftName -I %S/Inputs -source-filename=x -enable-experimental-cxx-interop | %FileCheck %s
|
|
//
|
|
// REQUIRES: objc_interop
|
|
|
|
// CHECK: class ColorMaker {
|
|
// CHECK: class func makeOtherColor(with x: Int32, withOptions opts: CFColorMask)
|
|
// CHECK: func makeOtherColor(with x: Int32, withOptions opts: CFColorMask)
|
|
// CHECK: @available(swift, obsoleted: 3, renamed: "makeOtherColor(with:withOptions:)")
|
|
// CHECK: class func makeOtherColorWithInt(_ x: Int32, withOptions opts: CFColorMask)
|
|
// CHECK: @available(swift, obsoleted: 3, renamed: "makeOtherColor(with:withOptions:)")
|
|
// CHECK: func makeOtherColorWithInt(_ x: Int32, withOptions opts: CFColorMask)
|
|
// CHECK: }
|