[interop][SwiftToCxx] pass structs to generic functions

hyp · hyp · commit bf224c75a6ec · 2022-08-08T15:28:00.000-07:00
diff --git a/lib/PrintAsClang/PrintClangClassType.cpp b/lib/PrintAsClang/PrintClangClassType.cpp
@@ -94,47 +94,8 @@ void ClangClassTypePrinter::printClassTypeDecl(
         os << "};\n";
       });
 
-  // FIXME: avoid popping out of the module's namespace here.
-  os << "} // end namespace \n\n";
-  os << "namespace swift {\n";
-
-  os << "#pragma clang diagnostic push\n";
-  os << "#pragma clang diagnostic ignored \"-Wc++17-extensions\"\n";
-  os << "template<>\n";
-  os << "static inline const constexpr bool isUsableInGenericContext<";
-  printer.printBaseName(typeDecl->getModuleContext());
-  os << "::";
-  printer.printBaseName(typeDecl);
-  os << "> = true;\n";
-  os << "#pragma clang diagnostic pop\n";
-
-  os << "template<>\n";
-  os << "inline void * _Nonnull getTypeMetadata<";
-  printer.printBaseName(typeDecl->getModuleContext());
-  os << "::";
-  printer.printBaseName(typeDecl);
-  os << ">() {\n";
-  os << "  return ";
-  printer.printBaseName(typeDecl->getModuleContext());
-  os << "::" << cxx_synthesis::getCxxImplNamespaceName()
-     << "::" << typeMetadataFuncName << "(0)._0;\n";
-  os << "}\n";
-  os << "namespace " << cxx_synthesis::getCxxImplNamespaceName() << "{\n";
-  os << "template<>\n";
-  os << "struct implClassFor<";
-  printer.printBaseName(typeDecl->getModuleContext());
-  os << "::";
-  printer.printBaseName(typeDecl);
-  os << "> { using type = ";
-  printer.printBaseName(typeDecl->getModuleContext());
-  os << "::" << cxx_synthesis::getCxxImplNamespaceName() << "::";
-  printCxxImplClassName(os, typeDecl);
-  os << "; };\n";
-  os << "} // namespace\n";
-  os << "} // namespace swift\n";
-  os << "\nnamespace ";
-  printer.printBaseName(typeDecl->getModuleContext());
-  os << " {\n";
+  ClangValueTypePrinter::printTypeGenericTraits(os, typeDecl,
+                                                typeMetadataFuncName);
 }
 
 void ClangClassTypePrinter::printClassTypeReturnScaffold(
diff --git a/lib/PrintAsClang/PrintClangValueType.cpp b/lib/PrintAsClang/PrintClangValueType.cpp
@@ -281,6 +281,8 @@ void ClangValueTypePrinter::printValueTypeDecl(
 
   if (!isOpaqueLayout)
     printCValueTypeStorageStruct(cPrologueOS, typeDecl, *typeSizeAlign);
+
+  printTypeGenericTraits(os, typeDecl, typeMetadataFuncName);
 }
 
 /// Print the name of the C stub struct for passing/returning a value type
@@ -456,3 +458,52 @@ void ClangValueTypePrinter::printValueTypeDirectReturnScaffold(
   os << ");\n";
   os << "  });\n";
 }
+
+void ClangValueTypePrinter::printTypeGenericTraits(
+    raw_ostream &os, const NominalTypeDecl *typeDecl,
+    StringRef typeMetadataFuncName) {
+  ClangSyntaxPrinter printer(os);
+  // FIXME: avoid popping out of the module's namespace here.
+  os << "} // end namespace \n\n";
+  os << "namespace swift {\n";
+
+  os << "#pragma clang diagnostic push\n";
+  os << "#pragma clang diagnostic ignored \"-Wc++17-extensions\"\n";
+  os << "template<>\n";
+  os << "static inline const constexpr bool isUsableInGenericContext<";
+  printer.printBaseName(typeDecl->getModuleContext());
+  os << "::";
+  printer.printBaseName(typeDecl);
+  os << "> = true;\n";
+  os << "#pragma clang diagnostic pop\n";
+
+  os << "template<>\n";
+  os << "inline void * _Nonnull getTypeMetadata<";
+  printer.printBaseName(typeDecl->getModuleContext());
+  os << "::";
+  printer.printBaseName(typeDecl);
+  os << ">() {\n";
+  os << "  return ";
+  printer.printBaseName(typeDecl->getModuleContext());
+  os << "::" << cxx_synthesis::getCxxImplNamespaceName()
+     << "::" << typeMetadataFuncName << "(0)._0;\n";
+  os << "}\n";
+  if (isa<ClassDecl>(typeDecl)) {
+    os << "namespace " << cxx_synthesis::getCxxImplNamespaceName() << "{\n";
+    os << "template<>\n";
+    os << "struct implClassFor<";
+    printer.printBaseName(typeDecl->getModuleContext());
+    os << "::";
+    printer.printBaseName(typeDecl);
+    os << "> { using type = ";
+    printer.printBaseName(typeDecl->getModuleContext());
+    os << "::" << cxx_synthesis::getCxxImplNamespaceName() << "::";
+    printCxxImplClassName(os, typeDecl);
+    os << "; };\n";
+    os << "} // namespace\n";
+  }
+  os << "} // namespace swift\n";
+  os << "\nnamespace ";
+  printer.printBaseName(typeDecl->getModuleContext());
+  os << " {\n";
+}
diff --git a/lib/PrintAsClang/PrintClangValueType.h b/lib/PrintAsClang/PrintClangValueType.h
@@ -94,6 +94,10 @@ class ClangValueTypePrinter {
       StringRef metadataVarName = "metadata",
       StringRef vwTableVarName = "vwTable");
 
+  static void printTypeGenericTraits(raw_ostream &os,
+                                     const NominalTypeDecl *typeDecl,
+                                     StringRef typeMetadataFuncName);
+
 private:
   /// Prints out the C stub name used to pass/return value directly for the
   /// given value type.
diff --git a/test/Interop/SwiftToCxx/generics/generic-function-execution.cpp b/test/Interop/SwiftToCxx/generics/generic-function-execution.cpp
@@ -156,5 +156,41 @@ int main() {
   }
 // CHECK-NEXT: deinit TestClass
 // CHECK-NEXT: deinit TestClass
+
+  {
+    auto x = createTestLargeStruct(0);
+    genericPrintFunction(x);
+  }
+// CHECK-NEXT: TestLargeStruct value=TestLargeStruct(x1: 0, x2: 1, x3: -1, x4: 0, x5: 2, x6: -2)
+
+  {
+    auto x = createTestLargeStruct(11);
+    auto y = createTestLargeStruct(-9);
+    genericPrintFunction(x);
+    genericPrintFunction(y);
+    genericSwap(x, y);
+    genericPrintFunction(x);
+    genericPrintFunction(y);
+  }
+// CHECK-NEXT: TestLargeStruct value=TestLargeStruct(x1: 11, x2: 12, x3: 10, x4: 11, x5: 13, x6: 9)
+// CHECK-NEXT: TestLargeStruct value=TestLargeStruct(x1: -9, x2: -8, x3: -10, x4: -9, x5: -7, x6: -11)
+// CHECK-NEXT: TestLargeStruct value=TestLargeStruct(x1: -9, x2: -8, x3: -10, x4: -9, x5: -7, x6: -11)
+    // CHECK-NEXT: TestLargeStruct value=TestLargeStruct(x1: 11, x2: 12, x3: 10, x4: 11, x5: 13, x6: 9)
+
+  {
+    auto x = createTestSmallStruct(45);
+    auto y = createTestSmallStruct(0xFed1);
+    genericPrintFunction(x);
+    genericPrintFunction(y);
+    genericSwap(y, x);
+    genericPrintFunction(x);
+    genericPrintFunction(y);
+  }
+// CHECK-NEXT: TestSmallStruct value=TestSmallStruct(x1: 45)
+// CHECK-NEXT: TestSmallStruct value=TestSmallStruct(x1: 65233)
+// CHECK-NEXT: TestSmallStruct value=TestSmallStruct(x1: 65233)
+// CHECK-NEXT: TestSmallStruct value=TestSmallStruct(x1: 45)
+
+// FIXME: return struct.
   return 0;
 }
diff --git a/test/Interop/SwiftToCxx/generics/generic-function-in-cxx.swift b/test/Interop/SwiftToCxx/generics/generic-function-in-cxx.swift
@@ -2,7 +2,7 @@
 // RUN: %target-swift-frontend %s -typecheck -module-name Functions -clang-header-expose-public-decls -emit-clang-header-path %t/functions.h
 // RUN: %FileCheck %s < %t/functions.h
 
-// RUN: %check-generic-interop-cxx-header-in-clang(%t/functions.h)
+// RUN: %check-generic-interop-cxx-header-in-clang(%t/functions.h -Wno-unused-function)
 
 
 public func genericPrintFunctionTwoArg<T>(_ x: T, _ y: Int) {
@@ -40,12 +40,41 @@ public class TestClass {
 
 public func createTestClass() -> TestClass { return TestClass() }
 
+public struct TestLargeStruct {
+    var x1, x2, x3, x4, x5, x6: Int
+
+    init(_ x: Int) {
+        x1 = x
+        x2 = x+1
+        x3 = x-1
+        x4 = x
+        x5 = x+2
+        x6 = x-2
+    }
+}
+
+public func createTestLargeStruct(_ x: Int) -> TestLargeStruct {
+    return TestLargeStruct(x)
+}
+
+public struct TestSmallStruct {
+    var x1: UInt32
+}
+
+public func createTestSmallStruct(_ x: UInt32) -> TestSmallStruct {
+    return TestSmallStruct(x1: x)
+}
+
 // CHECK: SWIFT_EXTERN void $s9Functions20genericPrintFunctionyyxlF(const void * _Nonnull x, void * _Nonnull ) SWIFT_NOEXCEPT SWIFT_CALL; // genericPrintFunction(_:)
 // CHECK-NEXT: SWIFT_EXTERN void $s9Functions32genericPrintFunctionMultiGenericyySi_xxSiq_tr0_lF(ptrdiff_t x, const void * _Nonnull t1, const void * _Nonnull t1p, ptrdiff_t y, const void * _Nonnull t2, void * _Nonnull , void * _Nonnull ) SWIFT_NOEXCEPT SWIFT_CALL; // genericPrintFunctionMultiGeneric(_:_:_:_:_:)
 // CHECK-NEXT: SWIFT_EXTERN void $s9Functions26genericPrintFunctionTwoArgyyx_SitlF(const void * _Nonnull x, ptrdiff_t y, void * _Nonnull ) SWIFT_NOEXCEPT SWIFT_CALL; // genericPrintFunctionTwoArg(_:_:)
 // CHECK-NEXT: SWIFT_EXTERN void $s9Functions10genericRetyxxlF(SWIFT_INDIRECT_RESULT void * _Nonnull, const void * _Nonnull x, void * _Nonnull ) SWIFT_NOEXCEPT SWIFT_CALL; // genericRet(_:)
 // CHECK-NEXT: SWIFT_EXTERN void $s9Functions11genericSwapyyxz_xztlF(void * _Nonnull x, void * _Nonnull y, void * _Nonnull ) SWIFT_NOEXCEPT SWIFT_CALL; // genericSwap(_:_:)
 
+// Skip templates in impl classes.
+// CHECK: _impl_TestSmallStruct
+// CHECK:      template<class T>
+
 // CHECK:      template<class T>
 // CHECK-NEXT: requires swift::isUsableInGenericContext<T>
 // CHECK-NEXT: inline void genericPrintFunction(const T & x) noexcept {
diff --git a/test/Interop/SwiftToCxx/structs/swift-struct-in-cxx.swift b/test/Interop/SwiftToCxx/structs/swift-struct-in-cxx.swift
@@ -61,6 +61,23 @@
 // CHECK-NEXT: };
 // CHECK-EMPTY:
 // CHECK-NEXT: }
+// CHECK-EMPTY:
+// CHECK-NEXT: } // end namespace
+// CHECK-EMPTY:
+// CHECK-NEXT: namespace swift {
+// CHECK-NEXT: #pragma clang diagnostic push
+// CHECK-NEXT: #pragma clang diagnostic ignored "-Wc++17-extensions"
+// CHECK-NEXT: template<>
+// CHECK-NEXT: static inline const constexpr bool isUsableInGenericContext<Structs::StructWithIntField> = true;
+// CHECK-NEXT: #pragma clang diagnostic pop
+// CHECK-NEXT: template<>
+// CHECK-NEXT: inline void * _Nonnull getTypeMetadata<Structs::StructWithIntField>() {
+// CHECK-NEXT:   return Structs::_impl::$s7Structs18StructWithIntFieldVMa(0)._0;
+// CHECK-NEXT: }
+// CHECK-NEXT: } // namespace swift
+// CHECK-EMPTY:
+// CHECK-NEXT: namespace Structs {
+
 public struct StructWithIntField {
   let field: Int64
 }
