Skip to content

Commit 5c99afc

Browse files
zoecarverzoecarver
committed
[tests] Fix platform specific tests and reverse interop tests.
1 parent 985db63 commit 5c99afc

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎test/Interop/Cxx/stdlib/libstdcxx-module-interface.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
// REQUIRES: OS=linux-gnu
1212

1313
// CHECK-STD: enum std {
14-
// CHECK-STRING: struct {{__CxxTemplateInstNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE|__CxxTemplateInstSs}} : CxxRandomAccessCollection {
15-
// CHECK-STRING: typealias value_type = std.__CxxTemplateInstSt11char_traitsIcE.char_type
14+
// CHECK-STRING: struct basic_string<Int8, char_traits<Int8>, allocator<Int8>> : CxxRandomAccessCollection {
15+
// CHECK-STRING: typealias value_type = std.char_traits<Int8>.char_type
1616
// CHECK-STRING: }
17-
// CHECK-STRING: struct {{__CxxTemplateInstNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE|__CxxTemplateInstSbIwSt11char_traitsIwESaIwEE}} : CxxRandomAccessCollection {
18-
// CHECK-STRING: typealias value_type = std.__CxxTemplateInstSt11char_traitsIwE.char_type
17+
// CHECK-STRING: struct basic_string<Scalar, char_traits<Scalar>, allocator<Scalar>> : CxxRandomAccessCollection {
18+
// CHECK-STRING: typealias value_type = std.char_traits<Scalar>.char_type
1919
// CHECK-STRING: }
2020

2121
// CHECK-TO-STRING: static func to_string(_ __val: Int32) -> std{{(.__cxx11)?}}.string
2222
// CHECK-TO-STRING: static func to_wstring(_ __val: Int32) -> std{{(.__cxx11)?}}.wstring
2323

2424
// CHECK-SIZE-T: typealias size_t = Int
2525

26-
// CHECK-STRING: typealias string = std.{{__cxx11.__CxxTemplateInstNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE|__CxxTemplateInstSs}}
27-
// CHECK-STRING: typealias wstring = std.{{__cxx11.__CxxTemplateInstNSt7__cxx1112basic_stringIwSt11char_traitsIwESaIwEEE|__CxxTemplateInstSbIwSt11char_traitsIwESaIwEE}}
26+
// CHECK-STRING: typealias string = std{{(.__cxx11)?}}.basic_string<Int8, char_traits<Int8>, allocator<Int8>>
27+
// CHECK-STRING: typealias wstring = std{{(.__cxx11)?}}.basic_string<Scalar, char_traits<Scalar>, allocator<Scalar>>
2828
// CHECK-STD: }

‎test/Interop/Cxx/stdlib/msvcprt-module-interface.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// CHECK-STRING: typealias size_t = size_t
1313
// CHECK-STRING: static func to_string(_ _Val: Int32) -> std.string
1414
// CHECK-STRING: static func to_wstring(_ _Val: Int32) -> std.wstring
15-
// CHECK-STRING: struct __CxxTemplateInstSs : CxxRandomAccessCollection {
15+
// CHECK-STRING: struct basic_string<Int8, char_traits<Int8>, allocator<Int8>> : CxxRandomAccessCollection {
1616
// CHECK-STRING: typealias value_type = CChar
1717
// CHECK-STRING: }
18-
// CHECK-STRING: struct __CxxTemplateInstSbIwSt11char_traitsIwESaIwEE : CxxRandomAccessCollection {
18+
// CHECK-STRING: struct basic_string<Scalar, char_traits<Scalar>, allocator<Scalar>> : CxxRandomAccessCollection {
1919
// CHECK-STRING: typealias value_type = CWideChar
2020
// CHECK-STRING: }
21-
// CHECK-STRING: typealias string = std.__CxxTemplateInstSs
22-
// CHECK-STRING: typealias wstring = std.__CxxTemplateInstSbIwSt11char_traitsIwESaIwEE
21+
// CHECK-STRING: typealias string = std.basic_string<Int8, char_traits<Int8>, allocator<Int8>>
22+
// CHECK-STRING: typealias wstring = std.basic_string<Scalar, char_traits<Scalar>, allocator<Scalar>>
2323
// CHECK-STRING: }
2424

‎test/Interop/Cxx/stdlib/overlay/custom-iterator-module-interface.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@
9393
// CHECK: static func == (lhs: TemplatedIterator<Int32>, other: TemplatedIterator<Int32>) -> Bool
9494
// CHECK: }
9595

96-
// CHECK: struct __CxxTemplateInst28TemplatedIteratorOutOfLineEqIiE : UnsafeCxxInputIterator {
96+
// CHECK: struct TemplatedIteratorOutOfLineEq<Int32> : UnsafeCxxInputIterator {
9797
// CHECK: var pointee: Int32 { get }
98-
// CHECK: func successor() -> __CxxTemplateInst28TemplatedIteratorOutOfLineEqIiE
98+
// CHECK: func successor() -> TemplatedIteratorOutOfLineEq<Int32>
9999
// CHECK: typealias Pointee = Int32
100100
// CHECK: }
101101

102-
// CHECK: struct __CxxTemplateInst31TemplatedRACIteratorOutOfLineEqIiE : UnsafeCxxRandomAccessIterator, UnsafeCxxInputIterator {
102+
// CHECK: struct TemplatedRACIteratorOutOfLineEq<Int32> : UnsafeCxxRandomAccessIterator, UnsafeCxxInputIterator {
103103
// CHECK: var pointee: Int32 { get }
104-
// CHECK: func successor() -> __CxxTemplateInst31TemplatedRACIteratorOutOfLineEqIiE
104+
// CHECK: func successor() -> TemplatedRACIteratorOutOfLineEq<Int32>
105105
// CHECK: typealias Pointee = Int32
106-
// CHECK: typealias Distance = __CxxTemplateInst31TemplatedRACIteratorOutOfLineEqIiE.difference_type
106+
// CHECK: typealias Distance = TemplatedRACIteratorOutOfLineEq<Int32>.difference_type
107107
// CHECK: }

‎test/Interop/CxxToSwiftToCxx/bridge-cxx-struct-back-to-cxx-execution.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,18 +150,18 @@ int main() {
150150
// CHECK-NEXT: move NonTrivialTemplate
151151
// CHECK-NEXT: ~NonTrivialTemplate
152152
// CHECK-NEXT: copy NonTrivialTemplate
153-
// CHECK-NEXT: __CxxTemplateInst18NonTrivialTemplateI7TrivialE(x: __C.Trivial(x: 42, y: -942))
153+
// CHECK-NEXT: NonTrivialTemplate<Trivial>(x: __C.Trivial(x: 42, y: -942))
154154
// CHECK-NEXT: ~NonTrivialTemplate
155155
// CHECK-NEXT: ~NonTrivialTemplate
156156
// CHECK-NEXT: done non trivial
157157
// CHECK-NEXT: copy NonTrivialTemplate
158-
// CHECK-NEXT: GENERIC __CxxTemplateInst18NonTrivialTemplateI7TrivialE(x: __C.Trivial(x: 42, y: -1884))
158+
// CHECK-NEXT: GENERIC NonTrivialTemplate<Trivial>(x: __C.Trivial(x: 42, y: -1884))
159159
// CHECK-NEXT: ~NonTrivialTemplate
160160
// CHECK-NEXT: copy NonTrivialTemplate
161161
// CHECK-NEXT: move NonTrivialTemplate
162162
// CHECK-NEXT: ~NonTrivialTemplate
163163
// CHECK-NEXT: copy NonTrivialTemplate
164-
// CHECK-NEXT: __CxxTemplateInst18NonTrivialTemplateI7TrivialE(x: __C.Trivial(x: 42, y: -1884))
164+
// CHECK-NEXT: NonTrivialTemplate<Trivial>(x: __C.Trivial(x: 42, y: -1884))
165165
// CHECK-NEXT: ~NonTrivialTemplate
166166
// CHECK-NEXT: ~NonTrivialTemplate
167167
// CHECK-NEXT: secondon non trivial

‎test/Interop/CxxToSwiftToCxx/bridge-cxx-struct-back-to-cxx.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@ public func takeTrivialInout(_ x: inout Trivial) {
153153
// CHECK-NEXT: #endif
154154

155155

156-
// CHECK: SWIFT_EXTERN void $s8UseCxxTy13retNonTrivialSo2nsO02__b18TemplateInstN2ns18efH4IiEEVyF(SWIFT_INDIRECT_RESULT void * _Nonnull) SWIFT_NOEXCEPT SWIFT_CALL; // retNonTrivial()
156+
// CHECK: SWIFT_EXTERN void $s8UseCxxTy13retNonTrivialSo2nsO0031NonTrivialTemplateInt32_fbGJhubVyF(SWIFT_INDIRECT_RESULT void * _Nonnull) SWIFT_NOEXCEPT SWIFT_CALL; // retNonTrivial()
157157
// CHECK: SWIFT_EXTERN struct swift_interop_returnStub_UseCxxTy_uint32_t_0_4 $s8UseCxxTy10retTrivialSo0E0VyF(void) SWIFT_NOEXCEPT SWIFT_CALL; // retTrivial()
158158

159159
// CHECK: ns::Immortal *_Nonnull retImmortal() noexcept SWIFT_SYMBOL({{.*}}) SWIFT_WARN_UNUSED_RESULT {
160160
// CHECK-NEXT: return _impl::$s8UseCxxTy11retImmortalSo2nsO0E0VyF();
161161
// CHECK-NEXT: }
162162

163163
// CHECK: ns::ImmortalTemplate<int> *_Nonnull retImmortalTemplate() noexcept SWIFT_SYMBOL({{.*}}) SWIFT_WARN_UNUSED_RESULT {
164-
// CHECK-NEXT: return _impl::$s8UseCxxTy19retImmortalTemplateSo2nsO02__bf10InstN2ns16eF4IiEEVyF();
164+
// CHECK-NEXT: return _impl::$s8UseCxxTy19retImmortalTemplateSo2nsO0029ImmortalTemplateInt32_hEFAhqbVyF();
165165
// CHECK-NEXT: }
166166

167167
// CHECK: } // end namespace
@@ -170,7 +170,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
170170
// CHECK-NEXT: namespace _impl {
171171
// CHECK-EMPTY:
172172
// CHECK-NEXT: // Type metadata accessor for NonTrivialTemplateInt
173-
// CHECK-NEXT: SWIFT_EXTERN swift::_impl::MetadataResponseTy $sSo2nsO033__CxxTemplateInstN2ns18NonTrivialC4IiEEVMa(swift::_impl::MetadataRequestTy) SWIFT_NOEXCEPT SWIFT_CALL;
173+
// CHECK-NEXT: SWIFT_EXTERN swift::_impl::MetadataResponseTy $sSo2nsO0031NonTrivialTemplateInt32_fbGJhubVMa(swift::_impl::MetadataRequestTy) SWIFT_NOEXCEPT SWIFT_CALL;
174174
// CHECK-EMPTY:
175175
// CHECK-EMPTY:
176176
// CHECK-NEXT: } // namespace _impl
@@ -182,7 +182,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
182182
// CHECK-NEXT: template<>
183183
// CHECK-NEXT: struct TypeMetadataTrait<ns::NonTrivialTemplateInt> {
184184
// CHECK-NEXT: static inline void * _Nonnull getTypeMetadata() {
185-
// CHECK-NEXT: return _impl::$sSo2nsO033__CxxTemplateInstN2ns18NonTrivialC4IiEEVMa(0)._0;
185+
// CHECK-NEXT: return _impl::$sSo2nsO0031NonTrivialTemplateInt32_fbGJhubVMa(0)._0;
186186
// CHECK-NEXT: }
187187
// CHECK-NEXT: };
188188
// CHECK-NEXT: namespace _impl{
@@ -197,7 +197,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
197197
// CHECK: inline ns::NonTrivialTemplate<int> retNonTrivial() noexcept SWIFT_SYMBOL({{.*}}) SWIFT_WARN_UNUSED_RESULT {
198198
// CHECK-NEXT: alignas(alignof(ns::NonTrivialTemplate<int>)) char storage[sizeof(ns::NonTrivialTemplate<int>)];
199199
// CHECK-NEXT: auto * _Nonnull storageObjectPtr = reinterpret_cast<ns::NonTrivialTemplate<int> *>(storage);
200-
// CHECK-NEXT: _impl::$s8UseCxxTy13retNonTrivialSo2nsO02__b18TemplateInstN2ns18efH4IiEEVyF(storage);
200+
// CHECK-NEXT: _impl::$s8UseCxxTy13retNonTrivialSo2nsO0031NonTrivialTemplateInt32_fbGJhubVyF(storage);
201201
// CHECK-NEXT: ns::NonTrivialTemplate<int> result(static_cast<ns::NonTrivialTemplate<int> &&>(*storageObjectPtr));
202202
// CHECK-NEXT: storageObjectPtr->~NonTrivialTemplate();
203203
// CHECK-NEXT: return result;
@@ -209,7 +209,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
209209
// CHECK-NEXT: namespace _impl {
210210
// CHECK-EMPTY:
211211
// CHECK-NEXT: // Type metadata accessor for NonTrivialTemplateTrivial
212-
// CHECK-NEXT: SWIFT_EXTERN swift::_impl::MetadataResponseTy $sSo2nsO033__CxxTemplateInstN2ns18NonTrivialC20INS_11TrivialinNSEEEVMa(swift::_impl::MetadataRequestTy) SWIFT_NOEXCEPT SWIFT_CALL;
212+
// CHECK-NEXT: SWIFT_EXTERN swift::_impl::MetadataResponseTy $sSo2nsO0037NonTrivialTemplateTrivialinNS_CsGGkdcVMa(swift::_impl::MetadataRequestTy) SWIFT_NOEXCEPT SWIFT_CALL;
213213
// CHECK-EMPTY:
214214
// CHECK-EMPTY:
215215
// CHECK-NEXT: } // namespace _impl
@@ -221,7 +221,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
221221
// CHECK-NEXT: template<>
222222
// CHECK-NEXT: struct TypeMetadataTrait<ns::NonTrivialTemplateTrivial> {
223223
// CHECK-NEXT: static inline void * _Nonnull getTypeMetadata() {
224-
// CHECK-NEXT: return _impl::$sSo2nsO033__CxxTemplateInstN2ns18NonTrivialC20INS_11TrivialinNSEEEVMa(0)._0;
224+
// CHECK-NEXT: return _impl::$sSo2nsO0037NonTrivialTemplateTrivialinNS_CsGGkdcVMa(0)._0;
225225
// CHECK-NEXT: }
226226
// CHECK-NEXT: };
227227
// CHECK-NEXT: namespace _impl{
@@ -236,7 +236,7 @@ public func takeTrivialInout(_ x: inout Trivial) {
236236
// CHECK-NEXT: inline ns::NonTrivialTemplate<ns::TrivialinNS> retNonTrivial2() noexcept SWIFT_SYMBOL({{.*}}) SWIFT_WARN_UNUSED_RESULT {
237237
// CHECK-NEXT: alignas(alignof(ns::NonTrivialTemplate<ns::TrivialinNS>)) char storage[sizeof(ns::NonTrivialTemplate<ns::TrivialinNS>)];
238238
// CHECK-NEXT: auto * _Nonnull storageObjectPtr = reinterpret_cast<ns::NonTrivialTemplate<ns::TrivialinNS> *>(storage);
239-
// CHECK-NEXT: _impl::$s8UseCxxTy14retNonTrivial2So2nsO02__b18TemplateInstN2ns18e7TrivialH20INS_11TrivialinNSEEEVyF(storage);
239+
// CHECK-NEXT: _impl::$s8UseCxxTy14retNonTrivial2So2nsO0037NonTrivialTemplateTrivialinNS_CsGGkdcVyF(storage);
240240
// CHECK-NEXT: ns::NonTrivialTemplate<ns::TrivialinNS> result(static_cast<ns::NonTrivialTemplate<ns::TrivialinNS> &&>(*storageObjectPtr));
241241
// CHECK-NEXT: storageObjectPtr->~NonTrivialTemplate();
242242
// CHECK-NEXT: return result;
@@ -265,11 +265,11 @@ public func takeTrivialInout(_ x: inout Trivial) {
265265
// CHECK-NEXT: }
266266

267267
// CHECK: void takeImmortalTemplate(ns::ImmortalTemplate<int> *_Nonnull x) noexcept SWIFT_SYMBOL({{.*}}) {
268-
// CHECK-NEXT: return _impl::$s8UseCxxTy20takeImmortalTemplateyySo2nsO02__bf10InstN2ns16eF4IiEEVF(x);
268+
// CHECK-NEXT: return _impl::$s8UseCxxTy20takeImmortalTemplateyySo2nsO0029ImmortalTemplateInt32_hEFAhqbVF(x);
269269
// CHECK-NEXT: }
270270

271271
// CHECK: inline void takeNonTrivial2(const ns::NonTrivialTemplate<ns::TrivialinNS>& x) noexcept SWIFT_SYMBOL({{.*}}) {
272-
// CHECK-NEXT: return _impl::$s8UseCxxTy15takeNonTrivial2yySo2nsO02__b18TemplateInstN2ns18e7TrivialH20INS_11TrivialinNSEEEVF(swift::_impl::getOpaquePointer(x));
272+
// CHECK-NEXT: return _impl::$s8UseCxxTy15takeNonTrivial2yySo2nsO0037NonTrivialTemplateTrivialinNS_CsGGkdcVF(swift::_impl::getOpaquePointer(x));
273273
// CHECK-NEXT: }
274274

275275
// CHECK: inline void takeTrivial(const Trivial& x) noexcept SWIFT_SYMBOL({{.*}}) {

0 commit comments

Comments
 (0)