Skip to content

Commit 3e4b52c

Browse files
hyphyp
committed
[interop][SwiftToCxx] add support for generic methods in generic structs ♺
1 parent 6e8b0be commit 3e4b52c

File tree

3 files changed

+62
-17
lines changed

3 files changed

+62
-17
lines changed

‎lib/PrintAsClang/ClangSyntaxPrinter.cpp

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -248,17 +248,16 @@ void ClangSyntaxPrinter::printGenericTypeParamTypeName(
248248
void ClangSyntaxPrinter::printGenericSignature(
249249
const CanGenericSignature &signature) {
250250
os << "template<";
251-
llvm::interleaveComma(
252-
signature.getGenericParams(), os,
253-
[&](const CanTypeWrapper<GenericTypeParamType> &genericParamType) {
254-
os << "class ";
255-
printGenericTypeParamTypeName(genericParamType);
256-
});
251+
llvm::interleaveComma(signature.getInnermostGenericParams(), os,
252+
[&](const GenericTypeParamType *genericParamType) {
253+
os << "class ";
254+
printGenericTypeParamTypeName(genericParamType);
255+
});
257256
os << ">\n";
258257
os << "requires ";
259258
llvm::interleave(
260-
signature.getGenericParams(), os,
261-
[&](const CanTypeWrapper<GenericTypeParamType> &genericParamType) {
259+
signature.getInnermostGenericParams(), os,
260+
[&](const GenericTypeParamType *genericParamType) {
262261
os << "swift::isUsableInGenericContext<";
263262
printGenericTypeParamTypeName(genericParamType);
264263
os << ">";
@@ -270,11 +269,10 @@ void ClangSyntaxPrinter::printGenericSignature(
270269
void ClangSyntaxPrinter::printGenericSignatureParams(
271270
const CanGenericSignature &signature) {
272271
os << '<';
273-
llvm::interleaveComma(
274-
signature.getGenericParams(), os,
275-
[&](const CanTypeWrapper<GenericTypeParamType> &genericParamType) {
276-
printGenericTypeParamTypeName(genericParamType);
277-
});
272+
llvm::interleaveComma(signature.getInnermostGenericParams(), os,
273+
[&](const GenericTypeParamType *genericParamType) {
274+
printGenericTypeParamTypeName(genericParamType);
275+
});
278276
os << '>';
279277
}
280278

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ int main() {
5151
// CHECK-NEXT: GenericPair<T, T2>::computeVar::set
5252
// CHECK-NEXT: GenericPair<T, T2>::computeVar::get
5353
// CHECK-NEXT: GenericPair<Int32, Int32>(x: -123456, y: 561)
54+
assert(x.genericMethod<float>(2.25f, 4221) == 2.25f);
55+
// CHECK-NEXT: GenericPair<T, T2>::genericMethod<T>::2.25,4221;
5456
}
5557

5658
{
@@ -93,6 +95,11 @@ int main() {
9395
// CHECK-NEXT: GenericPair<T, T2>::init::0,3425,-987;
9496
// CHECK-NEXT: CONCRETE pair of UInt32: 0 3425 ;
9597
// CHECK-NEXT: GenericPair<T, T2>::testme::0,3425;
98+
auto val = PairOfUInt64::init(0xafafa, 0x32443);
99+
auto valprime = x.genericMethod(val, 4221);
100+
assert(valprime.getX() == val.getX());
101+
assert(valprime.getY() == val.getY());
102+
// CHECK-NEXT: GenericPair<T, T2>::genericMethod<T>::PairOfUInt64(x: 719610, y: 205891),4221;
96103
}
97104
return 0;
98105
}

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

Lines changed: 44 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,30 @@
11
// RUN: %empty-directory(%t)
22
// RUN: %target-swift-frontend %s -typecheck -module-name Generics -clang-header-expose-public-decls -emit-clang-header-path %t/generics.h
33
// RUN: %FileCheck %s < %t/generics.h
4-
// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h)
4+
// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h -Wno-reserved-identifier)
55

66
// Check that an instantiation compiles too.
77
// RUN: echo "constexpr int x = sizeof(Generics::GenericPair<int, int>);" >> %t/generics.h
8-
// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h)
8+
// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h -Wno-reserved-identifier)
99

1010
// RUN: %empty-directory(%t)
1111
// RUN: %target-swift-frontend %s -enable-library-evolution -typecheck -module-name Generics -clang-header-expose-public-decls -emit-clang-header-path %t/generics.h
1212
// RUN: %FileCheck %s < %t/generics.h
13-
// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h)
13+
// RUN: %check-generic-interop-cxx-header-in-clang(%t/generics.h -Wno-reserved-identifier)
14+
15+
// FIXME: remove the need for -Wno-reserved-identifier
16+
17+
@frozen
18+
public struct PairOfUInt64 {
19+
public let x: UInt64
20+
public let y: UInt64
21+
22+
public init(_ x: UInt64,
23+
_ y: UInt64) {
24+
self.x = x
25+
self.y = y
26+
}
27+
}
1428

1529
@frozen
1630
public struct GenericPair<T, T2> {
@@ -38,6 +52,11 @@ public struct GenericPair<T, T2> {
3852
y = other.x
3953
}
4054

55+
public func genericMethod<T>(_ x: T, _ y: T2) -> T {
56+
print("GenericPair<T, T2>::genericMethod<T>::\(x),\(y);")
57+
return x
58+
}
59+
4160
public var computedProp: Int {
4261
return 42
4362
}
@@ -92,10 +111,12 @@ public func inoutConcretePair(_ x: UInt32, _ y: inout GenericPair<UInt32, UInt32
92111
// 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(_:_:_:)
93112
// CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV6methodyyF(void * _Nonnull , SWIFT_CONTEXT const void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // method()
94113
// CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV14mutatingMethodyyACyq_xGF(const void * _Nonnull other, void * _Nonnull , SWIFT_CONTEXT void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // mutatingMethod(_:)
114+
// 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(_:_:)
95115
// CHECK-NEXT: SWIFT_EXTERN ptrdiff_t $s8Generics11GenericPairV12computedPropSivg(void * _Nonnull , SWIFT_CONTEXT const void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // _
96116
// CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV11computedVarxvg(SWIFT_INDIRECT_RESULT void * _Nonnull, void * _Nonnull , SWIFT_CONTEXT const void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // _
97117
// CHECK-NEXT: SWIFT_EXTERN void $s8Generics11GenericPairV11computedVarxvs(const void * _Nonnull newValue, void * _Nonnull , SWIFT_CONTEXT void * _Nonnull _self) SWIFT_NOEXCEPT SWIFT_CALL; // _
98-
// CHECK-NEXT: SWIFT_EXTERN void $s8Generics17inoutConcretePairyys6UInt32V_AA07GenericD0VyA2DGztF(uint32_t x, char * _Nonnull y) SWIFT_NOEXCEPT SWIFT_CALL; // inoutConcretePair(_:_:)
118+
119+
// CHECK: SWIFT_EXTERN void $s8Generics17inoutConcretePairyys6UInt32V_AA07GenericD0VyA2DGztF(uint32_t x, char * _Nonnull y) SWIFT_NOEXCEPT SWIFT_CALL; // inoutConcretePair(_:_:)
99120
// 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(_:_:)
100121
// CHECK-NEXT: // Stub struct to be used to pass/return values to/from Swift functions.
101122
// CHECK-NEXT: struct swift_interop_stub_Generics_GenericPair_s6UInt32V_s6UInt32V {
@@ -253,6 +274,25 @@ public func inoutConcretePair(_ x: UInt32, _ y: inout GenericPair<UInt32, UInt32
253274
// CHECK-NEXT: }
254275
// CHECK-NEXT: template<class T_0_0, class T_0_1>
255276
// CHECK-NEXT: requires swift::isUsableInGenericContext<T_0_0> && swift::isUsableInGenericContext<T_0_1>
277+
// CHECK-NEXT: template<class T_1_0>
278+
// CHECK-NEXT: requires swift::isUsableInGenericContext<T_1_0>
279+
// 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 {
280+
// CHECK-NEXT: if constexpr (std::is_base_of<::swift::_impl::RefCountedClass, T_1_0>::value) {
281+
// CHECK-NEXT: void *returnValue;
282+
// 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());
283+
// CHECK-NEXT: return ::swift::_impl::implClassFor<T_1_0>::type::makeRetained(returnValue);
284+
// CHECK-NEXT: } else if constexpr (::swift::_impl::isValueType<T_1_0>) {
285+
// CHECK-NEXT: return ::swift::_impl::implClassFor<T_1_0>::type::returnNewValue([&](void * _Nonnull returnValue) {
286+
// 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());
287+
// CHECK-NEXT: });
288+
// CHECK-NEXT: } else {
289+
// CHECK-NEXT: T_1_0 returnValue;
290+
// 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());
291+
// CHECK-NEXT: return returnValue;
292+
// CHECK-NEXT: }
293+
// CHECK-NEXT: }
294+
// CHECK-NEXT: template<class T_0_0, class T_0_1>
295+
// CHECK-NEXT: requires swift::isUsableInGenericContext<T_0_0> && swift::isUsableInGenericContext<T_0_1>
256296
// CHECK-NEXT: inline swift::Int GenericPair<T_0_0, T_0_1>::getComputedProp() const {
257297
// CHECK-NEXT: return _impl::$s8Generics11GenericPairV12computedPropSivg(swift::TypeMetadataTrait<GenericPair<T_0_0, T_0_1>>::getTypeMetadata(), _getOpaquePointer());
258298
// CHECK-NEXT: }

0 commit comments

Comments
 (0)