Merge pull request #61443 from NuriAmari/swift-ide-test

[CXX-Interop] Respect NS_REFINED_FOR_SWIFT importing anon enums

Author: NuriAmari

lib/ClangImporter/ImportName.cpp

@@ -1800,7 +1800,17 @@ ImportedName NameImporter::importNameImpl(const clang::NamedDecl *D,
         // If the typedef is available in Swift, the user will get ambiguity.
         // It also means they may not have intended this API to be imported like this.
         if (importer::isUnavailableInSwift(typedefType->getDecl(), nullptr, true)) {
-          result.setDeclName(swiftCtx.getIdentifier(typedefType->getDecl()->getName()));
+          StringRef baseName = typedefType->getDecl()->getName();
+          SmallString<16> swiftPrivateScratch;
+          // If this declaration has the swift_private attribute, prepend "__"
+          if (shouldBeSwiftPrivate(*this, D, version,
+                                   result.info.hasAsyncInfo)) {
+            swiftPrivateScratch = "__";
+            swiftPrivateScratch += baseName;
+            baseName = swiftPrivateScratch;
+          }
+
+          result.setDeclName(swiftCtx.getIdentifier(baseName));
           result.setEffectiveContext(D->getDeclContext());
           return result;
         }

lib/ClangImporter/ImporterImpl.h

@@ -1908,6 +1908,26 @@ inline Optional<const clang::EnumDecl *> findAnonymousEnumForTypedef(
   if (found != foundDecls.end())
     return cast<clang::EnumDecl>(found->get<clang::NamedDecl *>());
 
+  // If a swift_private attribute has been attached to the enum, its name will
+  // be prefixed with two underscores
+  llvm::SmallString<32> swiftPrivateName;
+  swiftPrivateName += "__";
+  swiftPrivateName += typedefDecl->getName();
+  foundDecls = lookupTable->lookup(
+      SerializedSwiftName(ctx.getIdentifier(swiftPrivateName)),
+      EffectiveClangContext());
+
+  auto swiftPrivateFound =
+      llvm::find_if(foundDecls, [](SwiftLookupTable::SingleEntry decl) {
+        return decl.is<clang::NamedDecl *>() &&
+               isa<clang::EnumDecl>(decl.get<clang::NamedDecl *>()) &&
+               decl.get<clang::NamedDecl *>()
+                   ->hasAttr<clang::SwiftPrivateAttr>();
+      });
+
+  if (swiftPrivateFound != foundDecls.end())
+    return cast<clang::EnumDecl>(swiftPrivateFound->get<clang::NamedDecl *>());
+
   return None;
 }
 

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

@@ -17,6 +17,7 @@ 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)
+#define NS_REFINED_FOR_SWIFT __attribute__((swift_private))
 
 typedef unsigned long NSUInteger;
 
@@ -26,4 +27,16 @@ typedef NS_OPTIONS(NSUInteger, NSBinarySearchingOptions) {
 	NSBinarySearchingInsertionIndex = (1UL << 10),
 };
 
-}
+typedef NS_OPTIONS(NSUInteger, NSAttributedStringFormattingOptions) {
+  NSAttributedStringFormattingInsertArgumentAttributesWithoutMerging = 1 << 0,
+  NSAttributedStringFormattingApplyReplacementIndexAttribute = 1 << 1,
+} NS_REFINED_FOR_SWIFT;
+
+@interface NSAttributedString
+@end
+
+@interface NSAttributedString (NSAttributedStringFormatting)
+- (instancetype)initWithOptions:(NSAttributedStringFormattingOptions)options
+    NS_REFINED_FOR_SWIFT;
+@end
+}

test/Interop/Cxx/enum/c-enums-NS_OPTIONS-NS_REFINED_FOR_SWIFT.swift

@@ -0,0 +1,23 @@
+// 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 NSAttributedStringFormattingOptions = UInt
+// CHECK-NEXT: struct __NSAttributedStringFormattingOptions : OptionSet, @unchecked Sendable {
+// CHECK-NEXT:   init(rawValue: UInt)
+// CHECK-NEXT:   let rawValue: UInt
+// CHECK-NEXT:   typealias RawValue = UInt
+// CHECK-NEXT:   typealias Element = __NSAttributedStringFormattingOptions
+// CHECK-NEXT:   typealias ArrayLiteralElement = __NSAttributedStringFormattingOptions
+// CHECK-NEXT:   static var insertArgumentAttributesWithoutMerging: __NSAttributedStringFormattingOptions { get }
+// CHECK-NEXT:   @available(swift, obsoleted: 3, renamed: "insertArgumentAttributesWithoutMerging")
+// CHECK-NEXT:   static var InsertArgumentAttributesWithoutMerging: __NSAttributedStringFormattingOptions { get }
+// CHECK-NEXT:   static var applyReplacementIndexAttribute: __NSAttributedStringFormattingOptions { get }
+// CHECK-NEXT:   @available(swift, obsoleted: 3, renamed: "applyReplacementIndexAttribute")
+// CHECK-NEXT:   static var ApplyReplacementIndexAttribute: __NSAttributedStringFormattingOptions { get }
+// CHECK-NEXT: }
+
+// CHECK:      extension NSAttributedString {
+// CHECK-NEXT:   init!(__options options: __NSAttributedStringFormattingOptions = [])
+// CHECK-NEXT: }