Merge pull request #82723 from swiftlang/egorzhdan/6.2-cfoptions-block-param

🍒[cxx-interop] Fix generated header for Swift closures using `CF_OPTIONS` types

Author: egorzhdan

lib/AST/SwiftNameTranslation.cpp

@@ -16,6 +16,7 @@
 
 #include "swift/AST/SwiftNameTranslation.h"
 #include "swift/AST/ASTContext.h"
+#include "swift/AST/ClangModuleLoader.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/DiagnosticsSema.h"
 #include "swift/AST/LazyResolver.h"
@@ -54,9 +55,15 @@ getNameForObjC(const ValueDecl *VD, CustomNamesOnly_t customNamesOnly) {
   if (auto clangDecl = dyn_cast_or_null<clang::NamedDecl>(VD->getClangDecl())) {
     if (const clang::IdentifierInfo *II = clangDecl->getIdentifier())
       return II->getName();
-    if (auto *anonDecl = dyn_cast<clang::TagDecl>(clangDecl))
+    if (auto *anonDecl = dyn_cast<clang::TagDecl>(clangDecl)) {
       if (auto *anonTypedef = anonDecl->getTypedefNameForAnonDecl())
         return anonTypedef->getIdentifier()->getName();
+      if (auto *cfOptionsTy =
+              VD->getASTContext()
+                  .getClangModuleLoader()
+                  ->getTypeDefForCXXCFOptionsDefinition(anonDecl))
+        return cfOptionsTy->getDecl()->getName();
+    }
   }
 
   return VD->getBaseIdentifier().str();

test/Interop/ObjCToSwiftToObjCxx/bridge-objc-types-back-to-objcxx.swift

@@ -30,13 +30,28 @@
 - (void)method;
 @end
 
+typedef NS_OPTIONS(NSUInteger, ObjCKlassState) {
+  ObjCKlassStateNormal  = 0,
+};
+
+//--- ObjCTest.apinotes
+Name: ObjCTest
+Tags:
+- Name: ObjCKlassState
+  SwiftName: ObjCKlass.State
+
 //--- module.modulemap
 module ObjCTest {
     header "header.h"
 }
 
 //--- use-objc-types.swift
 import ObjCTest
+import Foundation
+
+@objc public class HasBlockField : NSObject {
+    @objc var foo: ((ObjCKlass.State) -> Void)?
+}
 
 public func retObjClass() -> ObjCKlass {
     return ObjCKlass()
@@ -73,6 +88,10 @@ public func retObjCClassArray() -> [ObjCKlass] {
     return []
 }
 
+// CHECK: @interface HasBlockField : NSObject
+// CHECK: @property (nonatomic, copy) void (^ _Nullable foo)(ObjCKlassState);
+// CHECK: @end
+
 // CHECK: SWIFT_EXTERN id <ObjCProtocol> _Nonnull $s9UseObjCTy03retB9CProtocolSo0bE0_pyF(void) SWIFT_NOEXCEPT SWIFT_CALL; // retObjCProtocol()
 // CHECK-NEXT: #endif
 // CHECK-NEXT: #if defined(__OBJC__)