Skip to content

Commit 1321678

Browse files
egorzhdanegorzhdan
authored
Merge pull request #68621 from apple/egorzhdan/5.10-reland-nsoptions
🍒Revert "Revert "[cxx-interop] Import custom `NS_OPTIONS` correctly""
2 parents 6548580 + e5027c5 commit 1321678

File tree

9 files changed

+104
-75
lines changed

9 files changed

+104
-75
lines changed

‎include/swift/AST/ClangModuleLoader.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,6 @@ class ClangModuleLoader : public ModuleLoader {
306306
virtual EffectiveClangContext getEffectiveClangContext(
307307
const NominalTypeDecl *nominal) = 0;
308308

309-
virtual const clang::TypedefType *
310-
getTypeDefForCXXCFOptionsDefinition(const clang::Decl *candidateDecl) = 0;
311-
312309
virtual SourceLoc importSourceLocation(clang::SourceLocation loc) = 0;
313310
};
314311

‎include/swift/ClangImporter/ClangImporter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,8 @@ class ClangImporter final : public ClangModuleLoader {
603603
/// Enable the symbolic import experimental feature for the given callback.
604604
void withSymbolicFeatureEnabled(llvm::function_ref<void(void)> callback);
605605

606-
const clang::TypedefType *getTypeDefForCXXCFOptionsDefinition(
607-
const clang::Decl *candidateDecl) override;
606+
static const clang::TypedefType *getTypedefForCXXCFOptionsDefinition(
607+
const clang::Decl *candidateDecl, const ASTContext &ctx);
608608

609609
SourceLoc importSourceLocation(clang::SourceLocation loc) override;
610610
};

‎lib/AST/ASTMangler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,8 +2541,8 @@ ASTMangler::getTypeDefForCXXCFOptionsDefinition(const ValueDecl *decl) {
25412541
if (!clangDecl)
25422542
return nullptr;
25432543

2544-
const auto &clangModuleLoader = decl->getASTContext().getClangModuleLoader();
2545-
return clangModuleLoader->getTypeDefForCXXCFOptionsDefinition(clangDecl);
2544+
auto &ctx = decl->getASTContext();
2545+
return ClangImporter::getTypedefForCXXCFOptionsDefinition(clangDecl, ctx);
25462546
}
25472547

25482548
const clang::NamedDecl *

‎lib/ClangImporter/ClangImporter.cpp

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7022,26 +7022,23 @@ void ClangImporter::withSymbolicFeatureEnabled(
70227022
oldImportSymbolicCXXDecls.get());
70237023
}
70247024

7025-
const clang::TypedefType *ClangImporter::getTypeDefForCXXCFOptionsDefinition(
7026-
const clang::Decl *candidateDecl) {
7027-
7028-
if (!Impl.SwiftContext.LangOpts.EnableCXXInterop)
7025+
const clang::TypedefType *ClangImporter::getTypedefForCXXCFOptionsDefinition(
7026+
const clang::Decl *candidateDecl, const ASTContext &ctx) {
7027+
if (!ctx.LangOpts.EnableCXXInterop)
70297028
return nullptr;
70307029

70317030
auto enumDecl = dyn_cast<clang::EnumDecl>(candidateDecl);
70327031
if (!enumDecl)
70337032
return nullptr;
7034-
70357033
if (!enumDecl->getDeclName().isEmpty())
70367034
return nullptr;
70377035

70387036
const clang::ElaboratedType *elaboratedType =
7039-
dyn_cast<clang::ElaboratedType>(enumDecl->getIntegerType().getTypePtr());
7037+
enumDecl->getIntegerType()->getAs<clang::ElaboratedType>();
70407038
if (auto typedefType =
70417039
elaboratedType
70427040
? dyn_cast<clang::TypedefType>(elaboratedType->desugar())
7043-
: dyn_cast<clang::TypedefType>(
7044-
enumDecl->getIntegerType().getTypePtr())) {
7041+
: enumDecl->getIntegerType()->getAs<clang::TypedefType>()) {
70457042
auto enumExtensibilityAttr =
70467043
elaboratedType
70477044
? enumDecl->getAttr<clang::EnumExtensibilityAttr>()
@@ -7054,8 +7051,13 @@ const clang::TypedefType *ClangImporter::getTypeDefForCXXCFOptionsDefinition(
70547051
enumExtensibilityAttr->getExtensibility() ==
70557052
clang::EnumExtensibilityAttr::Open &&
70567053
hasFlagEnumAttr) {
7057-
return Impl.isUnavailableInSwift(typedefType->getDecl()) ? typedefType
7058-
: nullptr;
7054+
// Make sure the typedef is marked as unavailable in Swift.
7055+
auto typedefDecl = typedefType->getDecl();
7056+
for (auto *attr :
7057+
typedefDecl->specific_attrs<clang::AvailabilityAttr>()) {
7058+
if (attr->getPlatform()->getName() == "swift")
7059+
return typedefType;
7060+
}
70597061
}
70607062
}
70617063

‎lib/ClangImporter/ImportType.cpp

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2646,44 +2646,30 @@ ArgumentAttrs ClangImporter::Implementation::inferDefaultArgument(
26462646
}
26472647
} else if (const clang::TypedefType *typedefType =
26482648
type->getAs<clang::TypedefType>()) {
2649-
// Get the AvailabilityAttr that would be set from CF/NS_OPTIONS
2650-
if (importer::isUnavailableInSwift(typedefType->getDecl(), nullptr, true)) {
2651-
// If we've taken this branch it means we have an enum type, and it is
2652-
// likely an integer or NSInteger that is being used by NS/CF_OPTIONS to
2653-
// behave like a C enum in the presence of C++.
2654-
auto enumName = typedefType->getDecl()->getName();
2655-
ArgumentAttrs argumentAttrs(DefaultArgumentKind::None, true, enumName);
2656-
auto camelCaseWords = camel_case::getWords(enumName);
2657-
for (auto it = camelCaseWords.rbegin(); it != camelCaseWords.rend();
2658-
++it) {
2659-
auto word = *it;
2660-
auto next = std::next(it);
2661-
if (camel_case::sameWordIgnoreFirstCase(word, "options")) {
2662-
argumentAttrs.argumentKind = DefaultArgumentKind::EmptyArray;
2663-
return argumentAttrs;
2649+
clang::TypedefNameDecl *typedefDecl = typedefType->getDecl();
2650+
// Find the next decl in the same context. If this typedef is a part of an
2651+
// NS/CF_OPTIONS declaration, the next decl will be an enum.
2652+
auto declsInContext = typedefDecl->getDeclContext()->decls();
2653+
auto declIter = llvm::find(declsInContext, typedefDecl);
2654+
if (declIter != declsInContext.end())
2655+
declIter++;
2656+
if (declIter != declsInContext.end()) {
2657+
if (auto enumDecl = dyn_cast<clang::EnumDecl>(*declIter)) {
2658+
if (auto cfOptionsTy =
2659+
ClangImporter::getTypedefForCXXCFOptionsDefinition(
2660+
enumDecl, nameImporter.getContext())) {
2661+
if (cfOptionsTy->getDecl() == typedefDecl) {
2662+
auto enumName = typedefDecl->getName();
2663+
ArgumentAttrs argumentAttrs(DefaultArgumentKind::None, true,
2664+
enumName);
2665+
for (auto word : llvm::reverse(camel_case::getWords(enumName))) {
2666+
if (camel_case::sameWordIgnoreFirstCase(word, "options")) {
2667+
argumentAttrs.argumentKind = DefaultArgumentKind::EmptyArray;
2668+
}
2669+
}
2670+
return argumentAttrs;
2671+
}
26642672
}
2665-
if (camel_case::sameWordIgnoreFirstCase(word, "units"))
2666-
return argumentAttrs;
2667-
if (camel_case::sameWordIgnoreFirstCase(word, "domain"))
2668-
return argumentAttrs;
2669-
if (camel_case::sameWordIgnoreFirstCase(word, "action"))
2670-
return argumentAttrs;
2671-
if (camel_case::sameWordIgnoreFirstCase(word, "event"))
2672-
return argumentAttrs;
2673-
if (camel_case::sameWordIgnoreFirstCase(word, "events") &&
2674-
next != camelCaseWords.rend() &&
2675-
camel_case::sameWordIgnoreFirstCase(*next, "control"))
2676-
return argumentAttrs;
2677-
if (camel_case::sameWordIgnoreFirstCase(word, "state"))
2678-
return argumentAttrs;
2679-
if (camel_case::sameWordIgnoreFirstCase(word, "unit"))
2680-
return argumentAttrs;
2681-
if (camel_case::sameWordIgnoreFirstCase(word, "position") &&
2682-
next != camelCaseWords.rend() &&
2683-
camel_case::sameWordIgnoreFirstCase(*next, "scroll"))
2684-
return argumentAttrs;
2685-
if (camel_case::sameWordIgnoreFirstCase(word, "edge"))
2686-
return argumentAttrs;
26872673
}
26882674
}
26892675
}

‎test/Interop/Cxx/enum/Inputs/c-enums-withOptions-omit.h

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,57 @@
1-
// Enum usage that is bitwise-able and assignable in C++, aka how CF_OPTIONS
2-
// does things.
3-
typedef int __attribute__((availability(swift, unavailable))) NSEnumerationOptions;
4-
enum : NSEnumerationOptions { NSEnumerationConcurrent, NSEnumerationReverse };
1+
typedef unsigned NSUInteger;
2+
3+
#define __CF_OPTIONS_ATTRIBUTES __attribute__((flag_enum,enum_extensibility(open)))
4+
#if (__cplusplus)
5+
#define CF_OPTIONS(_type, _name) __attribute__((availability(swift,unavailable))) _type _name; enum __CF_OPTIONS_ATTRIBUTES : _name
6+
#else
7+
#define CF_OPTIONS(_type, _name) enum __CF_OPTIONS_ATTRIBUTES _name : _type _name; enum _name : _type
8+
#endif
9+
10+
typedef CF_OPTIONS(NSUInteger, NSEnumerationOptions) {
11+
NSEnumerationConcurrent = (1UL << 0),
12+
NSEnumerationReverse = (1UL << 1),
13+
};
514

615
@interface NSSet
716
- (void)enumerateObjectsWithOptions:(NSEnumerationOptions)opts ;
817
@end
918

10-
typedef int __attribute__((availability(swift, unavailable))) NSOrderedCollectionDifferenceCalculationOptions;
11-
enum : NSOrderedCollectionDifferenceCalculationOptions {
19+
typedef CF_OPTIONS(NSUInteger, NSOrderedCollectionDifferenceCalculationOptions) {
1220
NSOrderedCollectionDifferenceCalculationOptions1,
1321
NSOrderedCollectionDifferenceCalculationOptions2
1422
};
1523

16-
typedef int __attribute__((availability(swift, unavailable))) NSCalendarUnit;
17-
enum : NSCalendarUnit { NSCalendarUnit1, NSCalendarUnit2 };
24+
typedef CF_OPTIONS(NSUInteger, NSCalendarUnit) {
25+
NSCalendarUnit1,
26+
NSCalendarUnit2
27+
};
1828

19-
typedef int __attribute__((availability(swift, unavailable))) NSSearchPathDomainMask;
20-
enum : NSSearchPathDomainMask { NSSearchPathDomainMask1, NSSearchPathDomainMask2 };
29+
typedef CF_OPTIONS(NSUInteger, NSSearchPathDomainMask) {
30+
NSSearchPathDomainMask1,
31+
NSSearchPathDomainMask2
32+
};
2133

22-
typedef int __attribute__((availability(swift, unavailable))) NSControlCharacterAction;
23-
enum : NSControlCharacterAction { NSControlCharacterAction1, NSControlCharacterAction2 };
34+
typedef CF_OPTIONS(NSUInteger, NSControlCharacterAction) {
35+
NSControlCharacterAction1,
36+
NSControlCharacterAction2
37+
};
2438

25-
typedef int __attribute__((availability(swift, unavailable))) UIControlState;
26-
enum : UIControlState { UIControlState1, UIControlState2 };
39+
typedef CF_OPTIONS(NSUInteger, UIControlState) {
40+
UIControlState1,
41+
UIControlState2
42+
};
2743

28-
typedef int __attribute__((availability(swift, unavailable))) UITableViewCellStateMask;
29-
enum : UITableViewCellStateMask { UITableViewCellStateMask1, UITableViewCellStateMask2 };
44+
typedef CF_OPTIONS(NSUInteger, UITableViewCellStateMask) {
45+
UITableViewCellStateMask1,
46+
UITableViewCellStateMask2
47+
};
3048

31-
typedef int __attribute__((availability(swift, unavailable))) UIControlEvents;
32-
enum : UIControlEvents { UIControlEvents1, UIControlEvents2 };
49+
typedef CF_OPTIONS(NSUInteger, UIControlEvents) {
50+
UIControlEvents1,
51+
UIControlEvents2
52+
};
3353

34-
typedef int __attribute__((availability(swift, unavailable)))
35-
UITableViewScrollPosition;
36-
enum : UITableViewScrollPosition {
54+
typedef CF_OPTIONS(NSUInteger, UITableViewScrollPosition) {
3755
UITableViewScrollPosition1,
3856
UITableViewScrollPosition2
3957
};

‎test/Interop/Cxx/objc-correctness/Inputs/customNSOptions.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#include "CFOptions.h"
2+
3+
typedef CF_OPTIONS(unsigned, MyControlFlags) {
4+
MyControlFlagsNone = 0,
5+
MyControlFlagsFirst
6+
};

‎test/Interop/Cxx/objc-correctness/Inputs/module.modulemap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ module CxxClassWithNSStringInit {
99
requires cplusplus
1010
}
1111

12+
module CustomNSOptions {
13+
header "customNSOptions.h"
14+
}
15+
1216
module NSOptionsMangling {
1317
header "NSOptionsMangling.h"
1418
}

‎test/Interop/Cxx/objc-correctness/custom-nsoptions.swift

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// RUN: rm -rf %t
2+
// RUN: mkdir -p %t/pch
3+
4+
// RUN: %target-typecheck-verify-swift -verify-ignore-unknown -I %S/Inputs -enable-objc-interop -enable-experimental-cxx-interop
5+
6+
// RUN: %target-swift-frontend -emit-pch -enable-objc-interop -enable-experimental-cxx-interop -o %t/pch/customNSOptions.pch %S/Inputs/customNSOptions.h
7+
// RUN: %target-typecheck-verify-swift -D BRIDGING_HEADER -I %S/Inputs -import-objc-header %t/pch/customNSOptions.pch -enable-objc-interop -enable-experimental-cxx-interop %s
8+
9+
// REQUIRES: objc_interop
10+
11+
#if !BRIDGING_HEADER
12+
import CustomNSOptions
13+
#endif
14+
15+
let flags1: MyControlFlags = []
16+
let flags2: MyControlFlags = [.first]

0 commit comments

Comments
 (0)