Merge pull request #68241 from apple/egorzhdan/5.9-cxx-to-swift-to-objcxx

🍒[cxx-interop][SwiftToCxx] Emit foreign reference types with `*` in the generated Clang header

Author: DougGregor

lib/PrintAsClang/DeclAndTypePrinter.cpp

@@ -2504,15 +2504,16 @@ class DeclAndTypePrinter::Implementation
   void visitClassType(ClassType *CT,
                       llvm::Optional<OptionalTypeKind> optionalKind) {
     const ClassDecl *CD = CT->getClassOrBoundGenericClass();
-    assert(CD->isObjC());
+    assert(CD->isObjC() || CD->isForeignReferenceType());
     auto clangDecl = dyn_cast_or_null<clang::NamedDecl>(CD->getClangDecl());
     if (clangDecl) {
       // Hack for <os/object.h> types, which use classes in Swift but
       // protocols in Objective-C, and a typedef to hide the difference.
       StringRef osObjectName = maybeGetOSObjectBaseName(clangDecl);
       if (!osObjectName.empty()) {
         os << osObjectName << "_t";
-      } else if (isa<clang::ObjCInterfaceDecl>(clangDecl)) {
+      } else if (isa<clang::ObjCInterfaceDecl>(clangDecl) ||
+                 CD->isForeignReferenceType()) {
         os << clangDecl->getName() << " *";
       } else {
         maybePrintTagKeyword(CD);

test/Interop/CxxToSwiftToObjcxx/Inputs/bridge-cxx-types-to-objcxx.h

@@ -0,0 +1,3 @@
+class __attribute__((swift_attr("import_reference"),
+                     swift_attr("retain:immortal"),
+                     swift_attr("release:immortal"))) X {};

test/Interop/CxxToSwiftToObjcxx/Inputs/module.modulemap

@@ -0,0 +1,5 @@
+module MyCxxModule {
+    header "bridge-cxx-types-to-objcxx.h"
+    export *
+    requires cplusplus
+}

test/Interop/CxxToSwiftToObjcxx/bridge-cxx-types-to-objcxx.swift

@@ -0,0 +1,15 @@
+// RUN: %empty-directory(%t)
+
+// RUN: %target-swift-frontend -typecheck %s -module-name UseCxxTy -emit-clang-header-path %t/UseCxxTy.h -I %t -I %S/Inputs -enable-experimental-cxx-interop -clang-header-expose-decls=all-public -target arm64-apple-macosx13.3
+// RUN: %FileCheck %s < %t/UseCxxTy.h
+
+// REQUIRES: OS=macosx
+
+import Foundation
+import MyCxxModule
+
+@objc class C: NSObject {
+  @objc var x: X? = nil
+}
+
+// CHECK: @property (nonatomic) X * _Nullable x;

test/Interop/CxxToSwiftToObjcxx/lit.local.cfg

@@ -0,0 +1 @@
+config.suffixes = ['.swift', '.cpp', '.mm']