Merge pull request #60915 from hyp/eng/generic-method-in-generic-struct

[interop][SwiftToCxx] add support for generic methods in generic structs

Author: hyp

lib/PrintAsClang/ClangSyntaxPrinter.cpp

@@ -248,17 +248,16 @@ void ClangSyntaxPrinter::printGenericTypeParamTypeName(
 void ClangSyntaxPrinter::printGenericSignature(
     const CanGenericSignature &signature) {
   os << "template<";
-  llvm::interleaveComma(
-      signature.getGenericParams(), os,
-      [&](const CanTypeWrapper<GenericTypeParamType> &genericParamType) {
-        os << "class ";
-        printGenericTypeParamTypeName(genericParamType);
-      });
+  llvm::interleaveComma(signature.getInnermostGenericParams(), os,
+                        [&](const GenericTypeParamType *genericParamType) {
+                          os << "class ";
+                          printGenericTypeParamTypeName(genericParamType);
+                        });
   os << ">\n";
   os << "requires ";
   llvm::interleave(
-      signature.getGenericParams(), os,
-      [&](const CanTypeWrapper<GenericTypeParamType> &genericParamType) {
+      signature.getInnermostGenericParams(), os,
+      [&](const GenericTypeParamType *genericParamType) {
         os << "swift::isUsableInGenericContext<";
         printGenericTypeParamTypeName(genericParamType);
         os << ">";
@@ -270,11 +269,10 @@ void ClangSyntaxPrinter::printGenericSignature(
 void ClangSyntaxPrinter::printGenericSignatureParams(
     const CanGenericSignature &signature) {
   os << '<';
-  llvm::interleaveComma(
-      signature.getGenericParams(), os,
-      [&](const CanTypeWrapper<GenericTypeParamType> &genericParamType) {
-        printGenericTypeParamTypeName(genericParamType);
-      });
+  llvm::interleaveComma(signature.getInnermostGenericParams(), os,
+                        [&](const GenericTypeParamType *genericParamType) {
+                          printGenericTypeParamTypeName(genericParamType);
+                        });
   os << '>';
 }
 

test/Interop/SwiftToCxx/generics/generic-struct-execution.cpp

@@ -51,6 +51,8 @@ int main() {
     // CHECK-NEXT: GenericPair<T, T2>::computeVar::set
     // CHECK-NEXT: GenericPair<T, T2>::computeVar::get
     // CHECK-NEXT: GenericPair<Int32, Int32>(x: -123456, y: 561)
+    assert(x.genericMethod<float>(2.25f, 4221) == 2.25f);
+    // CHECK-NEXT: GenericPair<T, T2>::genericMethod<T>::2.25,4221;
   }
 
   {
@@ -77,5 +79,27 @@ int main() {
     takeConcretePair(xprime);
     // CHECK-NEXT: CONCRETE pair of UInt32: 100000 918 ;
   }
+
+  {
+    auto x = GenericPair<int, int>::init(11, 234242, 44);
+    takeGenericPair(x);
+    x.method();
+    assert(x.getY() == 44);
+    // CHECK-NEXT: GenericPair<T, T2>::init::11,44,234242;
+    // CHECK-NEXT: GenericPair<Int32, Int32>(x: 11, y: 44)
+    // CHECK-NEXT: GenericPair<T, T2>::testme::11,44;
+    auto y = GenericPair<uint32_t, uint32_t>::init(0, -987, 3425);
+    takeConcretePair(y);
+    y.method();
+    assert(y.getY() == 3425);
+    // CHECK-NEXT: GenericPair<T, T2>::init::0,3425,-987;
+    // CHECK-NEXT: CONCRETE pair of UInt32: 0 3425 ;
+    // CHECK-NEXT: GenericPair<T, T2>::testme::0,3425;
+    auto val = PairOfUInt64::init(0xafafa, 0x32443);
+    auto valprime = x.genericMethod(val, 4221);
+    assert(valprime.getX() == val.getX());
+    assert(valprime.getY() == val.getY());
+    // CHECK-NEXT: GenericPair<T, T2>::genericMethod<T>::PairOfUInt64(x: 719610, y: 205891),4221;
+  }
   return 0;
 }

test/Interop/SwiftToCxx/generics/generic-struct-in-cxx.swift

@@ -1,22 +1,47 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend %s -typecheck -module-name Generics -clang-header-expose-public-decls -emit-clang-header-path %t/generics.h
 // RUN: %FileCheck %s < %t/generics.h
-// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h)
+// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h -Wno-reserved-identifier)
 
 // Check that an instantiation compiles too.
 // RUN: echo "constexpr int x = sizeof(Generics::GenericPair<int, int>);" >> %t/generics.h
-// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h)
+// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h -Wno-reserved-identifier)
 
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend %s -enable-library-evolution -typecheck -module-name Generics -clang-header-expose-public-decls -emit-clang-header-path %t/generics.h
 // RUN: %FileCheck %s < %t/generics.h
-// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h)
+// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h -Wno-reserved-identifier)
+
+// FIXME: remove the need for -Wno-reserved-identifier
+
+@frozen
+public struct PairOfUInt64 {
+    public let x: UInt64
+    public let y: UInt64
+
+    public init(_ x: UInt64,
+                _ y: UInt64) {
+        self.x = x
+        self.y = y
+    }
+}
 
 @frozen
 public struct GenericPair<T, T2> {
     var x: T
     public var y: T2
 
+    init(x: T, y: T2) {
+        self.x = x
+        self.y = y
+    }
+
+    public init(_ x: T, _ i: Int, _ y: T2) {
+        self.x = x
+        self.y = y
+        print("GenericPair<T, T2>::init::\(x),\(y),\(i);")
+    }
+
     public func method() {
         let copyOfSelf = self
         print("GenericPair<T, T2>::testme::\(x),\(copyOfSelf.y);")
@@ -27,6 +52,11 @@ public struct GenericPair<T, T2> {
         y = other.x
     }
 
+    public func genericMethod<T>(_ x: T, _ y: T2) -> T {
+        print("GenericPair<T, T2>::genericMethod<T>::\(x),\(y);")
+        return x
+    }
+
     public var computedProp: Int {
         return 42
     }
@@ -78,12 +108,15 @@ public func inoutConcretePair(_ x: UInt32, _ y: inout GenericPair<UInt32, UInt32
 
 // CHECK: SWIFT_EXTERN void $s8Generics11GenericPairV1yq_vg(SWIFT_INDIRECT_RESULT void * _Nonnull, void * _Nonnull , SWIFT_CONTEXT const void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // _
 // CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV1yq_vs(const void * _Nonnull value, void * _Nonnull , SWIFT_CONTEXT void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // _
+// CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairVyACyxq_Gx_Siq_tcfC(SWIFT_INDIRECT_RESULT void * _Nonnull, const void * _Nonnull x, ptrdiff_t i, const void * _Nonnull y, void * _Nonnull , void * _Nonnull ) SWIFT_NOEXCEPT SWIFT_CALL; // init(_:_:_:)
 // CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV6methodyyF(void * _Nonnull , SWIFT_CONTEXT const void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // method()
 // CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV14mutatingMethodyyACyq_xGF(const void * _Nonnull other, void * _Nonnull , SWIFT_CONTEXT void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // mutatingMethod(_:)
+// CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV13genericMethodyqd__qd___q_tlF(SWIFT_INDIRECT_RESULT void * _Nonnull, const void * _Nonnull x, const void * _Nonnull y, void * _Nonnull , void * _Nonnull , SWIFT_CONTEXT const void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // genericMethod(_:_:)
 // CHECK-NEXT: SWIFT_EXTERN ptrdiff_t $s8Generics11GenericPairV12computedPropSivg(void * _Nonnull , SWIFT_CONTEXT const void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // _
 // CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV11computedVarxvg(SWIFT_INDIRECT_RESULT void * _Nonnull, void * _Nonnull , SWIFT_CONTEXT const void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // _
 // CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV11computedVarxvs(const void * _Nonnull newValue, void * _Nonnull , SWIFT_CONTEXT void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // _
-// CHECK-NEXT: SWIFT_EXTERN void $s8Generics17inoutConcretePairyys6UInt32V_AA07GenericD0VyA2DGztF(uint32_t x, char * _Nonnull y) SWIFT_NOEXCEPT SWIFT_CALL; // inoutConcretePair(_:_:)
+
+// CHECK: SWIFT_EXTERN void $s8Generics17inoutConcretePairyys6UInt32V_AA07GenericD0VyA2DGztF(uint32_t x, char * _Nonnull y) SWIFT_NOEXCEPT SWIFT_CALL; // inoutConcretePair(_:_:)
 // CHECK-NEXT: SWIFT_EXTERN void $s8Generics16inoutGenericPairyyAA0cD0Vyxq_Gz_xtr0_lF(void * _Nonnull x, const void * _Nonnull y, void * _Nonnull , void * _Nonnull ) SWIFT_NOEXCEPT SWIFT_CALL; // inoutGenericPair(_:_:)
 // CHECK-NEXT: // Stub struct to be used to pass/return values to/from Swift functions.
 // CHECK-NEXT: struct swift_interop_stub_Generics_GenericPair_s6UInt32V_s6UInt32V {
@@ -224,6 +257,13 @@ public func inoutConcretePair(_ x: UInt32, _ y: inout GenericPair<UInt32, UInt32
 // CHECK-NEXT: }
 // CHECK-NEXT: template<class T_0_0, class T_0_1>
 // CHECK-NEXT: requires swift::isUsableInGenericContext<T_0_0> && swift::isUsableInGenericContext<T_0_1>
+// CHECK-NEXT: inline GenericPair<T_0_0, T_0_1> GenericPair<T_0_0, T_0_1>::init(const T_0_0& x, swift::Int i, const T_0_1& y) {
+// CHECK-NEXT: return _impl::_impl_GenericPair<T_0_0, T_0_1>::returnNewValue([&](void * _Nonnull result) {
+// CHECK-NEXT:   _impl::$s8Generics11GenericPairVyACyxq_Gx_Siq_tcfC(result, swift::_impl::getOpaquePointer(x), i, swift::_impl::getOpaquePointer(y), swift::TypeMetadataTrait<T_0_0>::getTypeMetadata(), swift::TypeMetadataTrait<T_0_1>::getTypeMetadata());
+// CHECK-NEXT: });
+// CHECK-NEXT: }
+// CHECK-NEXT: template<class T_0_0, class T_0_1>
+// CHECK-NEXT: requires swift::isUsableInGenericContext<T_0_0> && swift::isUsableInGenericContext<T_0_1>
 // CHECK-NEXT: inline void GenericPair<T_0_0, T_0_1>::method() const {
 // CHECK-NEXT: return _impl::$s8Generics11GenericPairV6methodyyF(swift::TypeMetadataTrait<GenericPair<T_0_0, T_0_1>>::getTypeMetadata(), _getOpaquePointer());
 // CHECK-NEXT: }
@@ -234,6 +274,25 @@ public func inoutConcretePair(_ x: UInt32, _ y: inout GenericPair<UInt32, UInt32
 // CHECK-NEXT: }
 // CHECK-NEXT: template<class T_0_0, class T_0_1>
 // CHECK-NEXT: requires swift::isUsableInGenericContext<T_0_0> && swift::isUsableInGenericContext<T_0_1>
+// CHECK-NEXT: template<class T_1_0>
+// CHECK-NEXT: requires swift::isUsableInGenericContext<T_1_0>
+// CHECK-NEXT: inline T_1_0 GenericPair<T_0_0, T_0_1>::genericMethod(const T_1_0& x, const T_0_1& y) const {
+// CHECK-NEXT: if constexpr (std::is_base_of<::swift::_impl::RefCountedClass, T_1_0>::value) {
+// CHECK-NEXT: void *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 ::swift::_impl::implClassFor<T_1_0>::type::makeRetained(returnValue);
+// CHECK-NEXT: } else if constexpr (::swift::_impl::isValueType<T_1_0>) {
+// 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: 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;
+// CHECK-NEXT: }
+// CHECK-NEXT: }
+// CHECK-NEXT: template<class T_0_0, class T_0_1>
+// CHECK-NEXT: requires swift::isUsableInGenericContext<T_0_0> && swift::isUsableInGenericContext<T_0_1>
 // CHECK-NEXT: inline swift::Int GenericPair<T_0_0, T_0_1>::getComputedProp() const {
 // CHECK-NEXT: return _impl::$s8Generics11GenericPairV12computedPropSivg(swift::TypeMetadataTrait<GenericPair<T_0_0, T_0_1>>::getTypeMetadata(), _getOpaquePointer());
 // CHECK-NEXT: }