Revert "Correct effective context translation for NS_OPTIONS anon C++ enums"

Author: zoecarver

lib/ClangImporter/SwiftLookupTable.cpp

@@ -212,17 +212,6 @@ translateDeclToContext(clang::NamedDecl *decl) {
     if (auto typedefDecl = tag->getTypedefNameForAnonDecl())
       return std::make_pair(SwiftLookupTable::ContextKind::Tag,
                             typedefDecl->getName());
-    if (auto enumDecl = dyn_cast<clang::EnumDecl>(tag)) {
-      if (auto typedefType = dyn_cast<clang::TypedefType>(
-              enumDecl->getIntegerType().getTypePtr())) {
-        if (importer::isUnavailableInSwift(typedefType->getDecl(), nullptr,
-                                           true)) {
-          return std::make_pair(SwiftLookupTable::ContextKind::Tag,
-                                typedefType->getDecl()->getName());
-        }
-      }
-    }
-
     return None;
   }
 

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

@@ -40,22 +40,3 @@ typedef NS_OPTIONS(NSUInteger, NSAttributedStringFormattingOptions) {
     NS_REFINED_FOR_SWIFT;
 @end
 }
-
-typedef NS_OPTIONS(NSUInteger, Foo) {
-  NS_SWIFT_NAMED_OptionOne __attribute__((swift_name("SwiftOptionOne"))) = 0,
-  NS_SWIFT_NAMED_OptionTwo __attribute__((swift_name("SwiftOptionTwo"))) = 1
-                                                                           << 0,
-  NS_SWIFT_NAMED_OptionThree
-  __attribute__((swift_name("SwiftOptionThree"))) = 1 << 1,
-  NS_SWIFT_NAMED_OptionFour
-  __attribute__((swift_name("SwiftOptionFour"))) = NS_SWIFT_NAMED_OptionOne |
-                                                   NS_SWIFT_NAMED_OptionTwo
-};
-
-typedef NS_OPTIONS(NSUInteger, Bar) {
-  API_NOTES_NAMED_OptionOne = 0,
-  API_NOTES_NAMED_OptionTwo = 1 << 0,
-  API_NOTES_NAMED_OptionThree = 1 << 1,
-  API_NOTES_NAMED_OptionFour = API_NOTES_NAMED_OptionOne |
-                               API_NOTES_NAMED_OptionTwo
-};