Skip to content

Commit b0f0377

Browse files
authored
Merge pull request #62164 from apple/revert-62058-ns-option-lookup-table-warning
2 parents 8443898 + 4856d1e commit b0f0377

File tree

5 files changed

+0
-62
lines changed

5 files changed

+0
-62
lines changed

lib/ClangImporter/SwiftLookupTable.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -212,17 +212,6 @@ translateDeclToContext(clang::NamedDecl *decl) {
212212
if (auto typedefDecl = tag->getTypedefNameForAnonDecl())
213213
return std::make_pair(SwiftLookupTable::ContextKind::Tag,
214214
typedefDecl->getName());
215-
if (auto enumDecl = dyn_cast<clang::EnumDecl>(tag)) {
216-
if (auto typedefType = dyn_cast<clang::TypedefType>(
217-
enumDecl->getIntegerType().getTypePtr())) {
218-
if (importer::isUnavailableInSwift(typedefType->getDecl(), nullptr,
219-
true)) {
220-
return std::make_pair(SwiftLookupTable::ContextKind::Tag,
221-
typedefType->getDecl()->getName());
222-
}
223-
}
224-
}
225-
226215
return None;
227216
}
228217

test/Interop/Cxx/enum/Inputs/CenumsNSOptions.apinotes

Lines changed: 0 additions & 10 deletions
This file was deleted.

test/Interop/Cxx/enum/Inputs/c-enums-NS_OPTIONS.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,3 @@ typedef NS_OPTIONS(NSUInteger, NSAttributedStringFormattingOptions) {
4040
NS_REFINED_FOR_SWIFT;
4141
@end
4242
}
43-
44-
typedef NS_OPTIONS(NSUInteger, Foo) {
45-
NS_SWIFT_NAMED_OptionOne __attribute__((swift_name("SwiftOptionOne"))) = 0,
46-
NS_SWIFT_NAMED_OptionTwo __attribute__((swift_name("SwiftOptionTwo"))) = 1
47-
<< 0,
48-
NS_SWIFT_NAMED_OptionThree
49-
__attribute__((swift_name("SwiftOptionThree"))) = 1 << 1,
50-
NS_SWIFT_NAMED_OptionFour
51-
__attribute__((swift_name("SwiftOptionFour"))) = NS_SWIFT_NAMED_OptionOne |
52-
NS_SWIFT_NAMED_OptionTwo
53-
};
54-
55-
typedef NS_OPTIONS(NSUInteger, Bar) {
56-
API_NOTES_NAMED_OptionOne = 0,
57-
API_NOTES_NAMED_OptionTwo = 1 << 0,
58-
API_NOTES_NAMED_OptionThree = 1 << 1,
59-
API_NOTES_NAMED_OptionFour = API_NOTES_NAMED_OptionOne |
60-
API_NOTES_NAMED_OptionTwo
61-
};

test/Interop/Cxx/enum/c-enums-NS_OPTIONS-api-notes-renamed-options.swift

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/Interop/Cxx/enum/c-enums-NS_OPTIONS-swift-named-options.swift

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)