[interop][SwiftToCxx] use C++ types bridged to Swift in Swift generic context from C++ ♾

hyp · hyp · commit 0dcb8b58e58c · 2022-09-12T13:05:49.000-07:00
diff --git a/lib/PrintAsClang/PrintClangFunction.cpp b/lib/PrintAsClang/PrintClangFunction.cpp
@@ -109,6 +109,13 @@ class ClangTypeHandler {
     ClangSyntaxPrinter(os).printNominalClangTypeReference(typeDecl);
   }
 
+  static void
+  printGenericReturnScaffold(raw_ostream &os, StringRef templateParamName,
+                             llvm::function_ref<void(StringRef)> bodyOfReturn) {
+    printReturnScaffold(nullptr, os, templateParamName, templateParamName,
+                        bodyOfReturn);
+  }
+
   void printReturnScaffold(raw_ostream &os,
                            llvm::function_ref<void(StringRef)> bodyOfReturn) {
     std::string fullQualifiedType;
@@ -119,14 +126,22 @@ class ClangTypeHandler {
       llvm::raw_string_ostream unqualTypeNameOS(typeName);
       unqualTypeNameOS << cast<clang::NamedDecl>(typeDecl)->getName();
     }
+    printReturnScaffold(typeDecl, os, fullQualifiedType, typeName,
+                        bodyOfReturn);
+  }
+
+private:
+  static void
+  printReturnScaffold(const clang::Decl *typeDecl, raw_ostream &os,
+                      StringRef fullQualifiedType, StringRef typeName,
+                      llvm::function_ref<void(StringRef)> bodyOfReturn) {
     os << "alignas(alignof(" << fullQualifiedType << ")) char storage[sizeof("
        << fullQualifiedType << ")];\n";
     os << "auto * _Nonnull storageObjectPtr = reinterpret_cast<"
        << fullQualifiedType << " *>(storage);\n";
     bodyOfReturn("storage");
     os << ";\n";
-    auto *cxxRecord = cast<clang::CXXRecordDecl>(typeDecl);
-    if (cxxRecord->isTrivial()) {
+    if (typeDecl && cast<clang::CXXRecordDecl>(typeDecl)->isTrivial()) {
       // Trivial object can be just copied and not destroyed.
       os << "return *storageObjectPtr;\n";
       return;
@@ -136,7 +151,6 @@ class ClangTypeHandler {
     os << "return result;\n";
   }
 
-private:
   const clang::Decl *typeDecl;
 };
 
@@ -999,6 +1013,11 @@ void DeclAndTypeClangFunctionPrinter::printCxxThunkBody(
          << ">::type::returnNewValue([&](void * _Nonnull returnValue) {\n";
       printCallToCFunc(/*additionalParam=*/StringRef("returnValue"));
       os << ";\n  });\n";
+      os << "  } else if constexpr (::swift::"
+         << cxx_synthesis::getCxxImplNamespaceName()
+         << "::isSwiftBridgedCxxRecord<" << resultTyName << ">) {\n";
+      ClangTypeHandler::printGenericReturnScaffold(os, resultTyName,
+                                                   printCallToCFunc);
       os << "  } else {\n";
       os << "  " << resultTyName << " returnValue;\n";
       printCallToCFunc(/*additionalParam=*/StringRef(ros.str()));
diff --git a/test/Interop/CxxToSwiftToCxx/bridge-cxx-struct-back-to-cxx-execution.cpp b/test/Interop/CxxToSwiftToCxx/bridge-cxx-struct-back-to-cxx-execution.cpp
@@ -3,7 +3,7 @@
 
 // RUN: %target-swift-frontend -typecheck %t/use-cxx-types.swift -typecheck -module-name UseCxx -emit-clang-header-path %t/UseCxx.h -I %t -enable-experimental-cxx-interop -clang-header-expose-public-decls
 
-// RUN: %target-interop-build-clangxx -c %t/use-swift-cxx-types.cpp -I %t -o %t/swift-cxx-execution.o -g
+// RUN: %target-interop-build-clangxx -std=c++20 -c %t/use-swift-cxx-types.cpp -I %t -o %t/swift-cxx-execution.o -g
 // RUN: %target-interop-build-swift %t/use-cxx-types.swift -o %t/swift-cxx-execution -Xlinker %t/swift-cxx-execution.o -module-name UseCxx -Xfrontend -entry-point-function-name -Xfrontend swiftMain -I %t -g
 
 // RUN: %target-codesign %t/swift-cxx-execution
@@ -80,6 +80,14 @@ public func inoutTrivial(_ x: inout Trivial) {
     x.x = x.y + x.x - 11
 }
 
+public func takeGeneric<T>(_ x: T) {
+    print("GENERIC", x)
+}
+
+public func retPassThroughGeneric<T>(_ x: T) -> T {
+    return x
+}
+
 //--- use-swift-cxx-types.cpp
 
 #include "header.h"
@@ -98,8 +106,15 @@ int main() {
     assert(x.x == -11);
     assert(x.y == -423421);
     UseCxx::takeTrivial(x);
+    UseCxx::takeGeneric(x);
+    auto xPrime = UseCxx::retPassThroughGeneric(x);
+    assert(xPrime.x == -11);
+    assert(xPrime.y == -423421);
+    UseCxx::takeTrivial(xPrime);
   }
 // CHECK: Trivial(x: 423421, y: -423421)
+// CHECK-NEXT: Trivial(x: -11, y: -423421)
+// CHECK-NEXT: GENERIC Trivial(x: -11, y: -423421)
 // CHECK-NEXT: Trivial(x: -11, y: -423421)
   {
     auto x = UseCxx::retNonTrivial(-942);
@@ -110,7 +125,16 @@ int main() {
     UseCxx::inoutNonTrivial(x);
     assert(x.x.y == -1884);
     assert(x.x.x == 42);
+    UseCxx::takeGeneric(x);
+    {
+      auto xPrime = UseCxx::retPassThroughGeneric(x);
+      assert(xPrime.x.y == -1884);
+      assert(xPrime.x.x == 42);
+      UseCxx::takeNonTrivial(xPrime);
+    }
+    puts("secondon non trivial");
   }
+  puts("EndOfTest");
 // CHECK-NEXT: create NonTrivialTemplate
 // CHECK-NEXT: move NonTrivialTemplate
 // CHECK-NEXT: ~NonTrivialTemplate
@@ -122,6 +146,18 @@ int main() {
 // CHECK-NEXT: ~NonTrivialTemplate
 // CHECK-NEXT: ~NonTrivialTemplate
 // CHECK-NEXT: done non trivial
+// CHECK-NEXT: copy NonTrivialTemplate
+// CHECK-NEXT: GENERIC __CxxTemplateInst18NonTrivialTemplateI7TrivialE(x: __C.Trivial(x: 42, y: -1884))
+// CHECK-NEXT: ~NonTrivialTemplate
+// CHECK-NEXT: copy NonTrivialTemplate
+// CHECK-NEXT: move NonTrivialTemplate
+// CHECK-NEXT: ~NonTrivialTemplate
+// CHECK-NEXT: copy NonTrivialTemplate
+// CHECK-NEXT: __CxxTemplateInst18NonTrivialTemplateI7TrivialE(x: __C.Trivial(x: 42, y: -1884))
+// CHECK-NEXT: ~NonTrivialTemplate
+// CHECK-NEXT: ~NonTrivialTemplate
+// CHECK-NEXT: secondon non trivial
 // CHECK-NEXT: ~NonTrivialTemplate
+// CHECK-NEXT: EndOfTest
   return 0;
 }
diff --git a/test/Interop/SwiftToCxx/generics/generic-function-in-cxx.swift b/test/Interop/SwiftToCxx/generics/generic-function-in-cxx.swift
@@ -150,6 +150,13 @@ public func createTestSmallStruct(_ x: UInt32) -> TestSmallStruct {
 // CHECK-NEXT:    return ::swift::_impl::implClassFor<T_0_0>::type::returnNewValue([&](void * _Nonnull returnValue) {
 // CHECK-NEXT:    _impl::$s9Functions10genericRetyxxlF(returnValue, swift::_impl::getOpaquePointer(x), swift::TypeMetadataTrait<T_0_0>::getTypeMetadata());
 // CHECK-NEXT:    });
+// CHECK-NEXT:    } else if constexpr (::swift::_impl::isSwiftBridgedCxxRecord<T_0_0>) {
+// CHECK-NEXT:    alignas(alignof(T_0_0)) char storage[sizeof(T_0_0)];
+// CHECK-NEXT:    auto * _Nonnull storageObjectPtr = reinterpret_cast<T_0_0 *>(storage);
+// CHECK-NEXT:    _impl::$s9Functions10genericRetyxxlF(storage, swift::_impl::getOpaquePointer(x), swift::TypeMetadataTrait<T_0_0>::getTypeMetadata());
+// CHECK-NEXT:    T_0_0 result(std::move(*storageObjectPtr));
+// CHECK-NEXT:    storageObjectPtr->~T_0_0();
+// CHECK-NEXT:    return result;
 // CHECK-NEXT:    } else {
 // CHECK-NEXT:    T_0_0 returnValue;
 // CHECK-NEXT:    _impl::$s9Functions10genericRetyxxlF(reinterpret_cast<void *>(&returnValue), swift::_impl::getOpaquePointer(x), swift::TypeMetadataTrait<T_0_0>::getTypeMetadata());
@@ -174,6 +181,13 @@ public func createTestSmallStruct(_ x: UInt32) -> TestSmallStruct {
 // CHECK-NEXT:   return ::swift::_impl::implClassFor<T_0_0>::type::returnNewValue([&](void * _Nonnull returnValue) {
 // CHECK-NEXT: _impl::$s9Functions15TestSmallStructV24genericMethodPassThroughyxxlF(returnValue, swift::_impl::getOpaquePointer(x), _impl::swift_interop_passDirect_Functions_uint32_t_0_4(_getOpaquePointer()), swift::TypeMetadataTrait<T_0_0>::getTypeMetadata());
 // CHECK-NEXT:   });
+// CHECK-NEXT:   } else if constexpr (::swift::_impl::isSwiftBridgedCxxRecord<T_0_0>) {
+// CHECK-NEXT:    alignas(alignof(T_0_0)) char storage[sizeof(T_0_0)];
+// CHECK-NEXT:    auto * _Nonnull storageObjectPtr = reinterpret_cast<T_0_0 *>(storage);
+// CHECK-NEXT:    _impl::$s9Functions15TestSmallStructV24genericMethodPassThroughyxxlF(storage, swift::_impl::getOpaquePointer(x), _impl::swift_interop_passDirect_Functions_uint32_t_0_4(_getOpaquePointer()), swift::TypeMetadataTrait<T_0_0>::getTypeMetadata())
+// CHECK-NEXT:    T_0_0 result(std::move(*storageObjectPtr));
+// CHECK-NEXT:    storageObjectPtr->~T_0_0();
+// CHECK-NEXT:    return result;
 // CHECK-NEXT:   } else {
 // CHECK-NEXT:   T_0_0 returnValue;
 // CHECK-NEXT: _impl::$s9Functions15TestSmallStructV24genericMethodPassThroughyxxlF(reinterpret_cast<void *>(&returnValue), swift::_impl::getOpaquePointer(x), _impl::swift_interop_passDirect_Functions_uint32_t_0_4(_getOpaquePointer()), swift::TypeMetadataTrait<T_0_0>::getTypeMetadata());
diff --git a/test/Interop/SwiftToCxx/generics/generic-struct-in-cxx.swift b/test/Interop/SwiftToCxx/generics/generic-struct-in-cxx.swift
@@ -304,7 +304,8 @@ public func inoutConcretePair(_ x: UInt16, _ y: inout GenericPair<UInt16, UInt16
 // CHECK-NEXT: return ::swift::_impl::implClassFor<T_0_1>::type::returnNewValue([&](void * _Nonnull returnValue) {
 // CHECK-NEXT: _impl::$s8Generics11GenericPairV1yq_vg(returnValue, swift::TypeMetadataTrait<GenericPair<T_0_0, T_0_1>>::getTypeMetadata(), _getOpaquePointer());
 // CHECK-NEXT: });
-// CHECK-NEXT: } else {
+// CHECK-NEXT:   } else if constexpr (::swift::_impl::isSwiftBridgedCxxRecord<T_0_1>) {
+// CHECK: } else {
 // CHECK-NEXT: T_0_1 returnValue;
 // CHECK-NEXT: _impl::$s8Generics11GenericPairV1yq_vg(reinterpret_cast<void *>(&returnValue), swift::TypeMetadataTrait<GenericPair<T_0_0, T_0_1>>::getTypeMetadata(), _getOpaquePointer());
 // CHECK-NEXT: return returnValue;
@@ -345,7 +346,8 @@ public func inoutConcretePair(_ x: UInt16, _ y: inout GenericPair<UInt16, UInt16
 // CHECK-NEXT: return ::swift::_impl::implClassFor<T_1_0>::type::returnNewValue([&](void * _Nonnull returnValue) {
 // CHECK-NEXT: _impl::$s8Generics11GenericPairV13genericMethodyqd__qd___q_tlF(returnValue, swift::_impl::getOpaquePointer(x), swift::_impl::getOpaquePointer(y), swift::TypeMetadataTrait<GenericPair<T_0_0, T_0_1>>::getTypeMetadata(), swift::TypeMetadataTrait<T_1_0>::getTypeMetadata(), _getOpaquePointer());
 // CHECK-NEXT: });
-// CHECK-NEXT: } else {
+// CHECK-NEXT: } else if constexpr (::swift::_impl::isSwiftBridgedCxxRecord<T_1_0>) {
+// CHECK:      } else {
 // CHECK-NEXT: T_1_0 returnValue;
 // CHECK-NEXT: _impl::$s8Generics11GenericPairV13genericMethodyqd__qd___q_tlF(reinterpret_cast<void *>(&returnValue), swift::_impl::getOpaquePointer(x), swift::_impl::getOpaquePointer(y), swift::TypeMetadataTrait<GenericPair<T_0_0, T_0_1>>::getTypeMetadata(), swift::TypeMetadataTrait<T_1_0>::getTypeMetadata(), _getOpaquePointer());
 // CHECK-NEXT: return returnValue;
