Skip to content

Commit 324c20d

Browse files
nickolas-pohiletsiOS Robot
nickolas-pohilets
authored and
iOS Robot
committed
Fixed tests on Linux, Windows and older MacOS versions
1 parent b9d8b0a commit 324c20d

File tree

11 files changed

+88
-73
lines changed

11 files changed

+88
-73
lines changed

‎stdlib/private/StdlibUnittest/SymbolLookup.swift

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#endif
3838
#elseif os(Windows)
3939
let hStdlibCore: HMODULE = GetModuleHandleA("swiftCore.dll")!
40+
let hStdlibConcurrency: HMODULE = GetModuleHandleA("swift_Concurrency.dll")!
4041
#elseif os(WASI)
4142
// WASI doesn't support dynamic linking yet.
4243
#else
@@ -53,3 +54,14 @@ public func pointerToSwiftCoreSymbol(name: String) -> UnsafeMutableRawPointer? {
5354
return dlsym(RTLD_DEFAULT, name)
5455
#endif
5556
}
57+
58+
public func pointerToSwiftConcurrencySymbol(name: String) -> UnsafeMutableRawPointer? {
59+
#if os(Windows)
60+
return unsafeBitCast(GetProcAddress(hStdlibConcurrency, name),
61+
to: UnsafeMutableRawPointer?.self)
62+
#elseif os(WASI)
63+
fatalError("\(#function) is not supported on WebAssembly/WASI")
64+
#else
65+
return dlsym(RTLD_DEFAULT, name)
66+
#endif
67+
}

‎test/Concurrency/Runtime/actor_deinit_escaping_self.swift

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library)
22

33
// REQUIRES: executable_test
4+
// REQUIRES: libdispatch
45
// REQUIRES: concurrency
56
// REQUIRES: concurrency_runtime
67
// UNSUPPORTED: back_deployment_runtime
@@ -54,14 +55,20 @@ actor EscapeUnlocked {
5455

5556
@main struct Main {
5657
static func main() async {
58+
// Ideally these tests should be compile-time errors
5759
let tests = TestSuite("EscapingSelf")
5860
tests.test("escape while locked") {
5961
_ = EscapeLocked()
6062
}
6163

62-
tests.test("escape while unlocked") {
63-
await withUnsafeContinuation { cont in
64-
_ = EscapeUnlocked(cont)
64+
// We cannot really reliably test access to deallocated memory
65+
// To have a reliable test, crash must happen before memory is deallocated
66+
// TODO: Re-enable this, when self escaping from deinit triggers a fatalError() before deallocating memory
67+
if false {
68+
tests.test("escape while unlocked") {
69+
await withUnsafeContinuation { cont in
70+
_ = EscapeUnlocked(cont)
71+
}
6572
}
6673
}
6774
await runAllTestsAsync()

‎test/Concurrency/Runtime/actor_recursive_deinit.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
// REQUIRES: concurrency_runtime
77
// UNSUPPORTED: back_deployment_runtime
88

9+
import StdlibUnittest
10+
911
#if canImport(Darwin)
1012
import Darwin
1113
typealias ThreadID = pthread_t
@@ -30,8 +32,7 @@ func isMainThread() -> Bool {
3032

3133
// Look up a symbol using dlsym and cast the result to an arbitrary type.
3234
func lookup<T>(_ name: String) -> T {
33-
let RTLD_DEFAULT = UnsafeMutableRawPointer(bitPattern: -2)
34-
let result = dlsym(RTLD_DEFAULT, name)
35+
let result = pointerToSwiftConcurrencySymbol(name: name)
3536
return unsafeBitCast(result, to: T.self)
3637
}
3738

‎test/Concurrency/Runtime/async_task_locals_isolated_deinit.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking %import-libdispatch)
22

3+
// REQUIRES: libdispatch
34
// REQUIRES: executable_test
45
// REQUIRES: concurrency
6+
// REQUIRES: concurrency_runtime
7+
// UNSUPPORTED: back_deployment_runtime
58

69
@preconcurrency import Dispatch
710
import StdlibUnittest
811

912
// Look up a symbol using dlsym and cast the result to an arbitrary type.
1013
func lookup<T>(_ name: String) -> T {
11-
let RTLD_DEFAULT = UnsafeMutableRawPointer(bitPattern: -2)
12-
let result = dlsym(RTLD_DEFAULT, name)
14+
let result = pointerToSwiftConcurrencySymbol(name: name)
1315
return unsafeBitCast(result, to: T.self)
1416
}
1517

‎test/Concurrency/deinit_isolation.swift

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %target-swift-frontend -parse-as-library -emit-silgen -verify %s
2-
// RUN: %target-swift-frontend -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
3-
// RUN: %target-swift-frontend -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
1+
// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -verify %s
2+
// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
3+
// RUN: %target-swift-frontend -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
44

55
// REQUIRES: concurrency
66

@@ -22,7 +22,7 @@
2222
func isolatedFunc() {} // expected-note 11{{calls to global function 'isolatedFunc()' from outside of its actor context are implicitly asynchronous}}
2323

2424
// CHECK-LABEL: class BaseWithNonisolatedDeinit {
25-
// CHECK: @objc deinit
25+
// CHECK: {{(@objc )?}}deinit
2626
// CHECK: }
2727
// CHECK-SYMB-NOT: BaseWithNonisolatedDeinit.__isolated_deallocating_deinit
2828
// CHECK-SYMB-NOT: @$s16deinit_isolation25BaseWithNonisolatedDeinitCfZ
@@ -31,7 +31,7 @@ func isolatedFunc() {} // expected-note 11{{calls to global function 'isolatedF
3131
class BaseWithNonisolatedDeinit {}
3232

3333
// CHECK-LABEL: class BaseWithDeinitIsolatedOnFirstActor {
34-
// CHECK: @objc @FirstActor deinit
34+
// CHECK: {{(@objc )?}}@FirstActor deinit
3535
// CHECK: }
3636
// CHECK-SYMB: BaseWithDeinitIsolatedOnFirstActor.__isolated_deallocating_deinit
3737
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation34BaseWithDeinitIsolatedOnFirstActorCfZ : $@convention(thin) (@owned BaseWithDeinitIsolatedOnFirstActor) -> () {
@@ -42,7 +42,7 @@ class BaseWithDeinitIsolatedOnFirstActor {
4242
}
4343

4444
// CHECK-LABEL: class BaseWithDeinitIsolatedOnSecondActor {
45-
// CHECK: @objc @SecondActor deinit
45+
// CHECK: {{(@objc )?}}@SecondActor deinit
4646
// CHECK: }
4747
// CHECK-SYMB: BaseWithDeinitIsolatedOnSecondActor.__isolated_deallocating_deinit
4848
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation35BaseWithDeinitIsolatedOnSecondActorCfZ : $@convention(thin) (@owned BaseWithDeinitIsolatedOnSecondActor) -> () {
@@ -55,7 +55,7 @@ class BaseWithDeinitIsolatedOnSecondActor {
5555
// MARK: - Part 1 - Actors
5656

5757
// CHECK-LABEL: actor ImplicitDeinitActor {
58-
// CHECK: @objc nonisolated deinit
58+
// CHECK: {{(@objc )?}}nonisolated deinit
5959
// CHECK: }
6060
// CHECK-SYMB-NOT: ImplicitDeinitActor.__isolated_deallocating_deinit
6161
// CHECK-SYMB-NOT: @$s16deinit_isolation19ImplicitDeinitActorCfZ
@@ -66,7 +66,7 @@ actor ImplicitDeinitActor {
6666
}
6767

6868
// CHECK-LABEL: actor ExplicitDeinitActor {
69-
// CHECK: @objc deinit
69+
// CHECK: {{(@objc )?}}deinit
7070
// CHECK: }
7171
// CHECK-SYMB: // ExplicitDeinitActor.__isolated_deallocating_deinit
7272
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation19ExplicitDeinitActorCfZ : $@convention(thin) (@owned ExplicitDeinitActor) -> () {
@@ -82,7 +82,7 @@ actor ExplicitDeinitActor {
8282
}
8383

8484
// CHECK-LABEL: actor NonisolatedDeinitActor {
85-
// CHECK: @objc nonisolated deinit
85+
// CHECK: {{(@objc )?}}nonisolated deinit
8686
// CHECK: }
8787
// CHECK-SYMB-NOT: NonisolatedDeinitActor.__isolated_deallocating_deinit
8888
// CHECK-SYMB-NOT: @$s16deinit_isolation22NonisolatedDeinitActorCfZ
@@ -98,7 +98,7 @@ actor NonisolatedDeinitActor {
9898
}
9999

100100
// CHECK-LABEL: actor IsolatedDeinitActor {
101-
// CHECK: @objc @FirstActor deinit
101+
// CHECK: {{(@objc )?}}@FirstActor deinit
102102
// CHECK: }
103103
// CHECK-SYMB: // IsolatedDeinitActor.__isolated_deallocating_deinit
104104
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation19IsolatedDeinitActorCfZ : $@convention(thin) (@owned IsolatedDeinitActor) -> () {
@@ -115,7 +115,7 @@ actor IsolatedDeinitActor {
115115
// MARK: - Part 2.1 - Without base class
116116

117117
// CHECK-LABEL: @FirstActor class ImplicitDeinit {
118-
// CHECK: @objc deinit
118+
// CHECK: {{(@objc )?}}deinit
119119
// CHECK: }
120120
// CHECK-SYMB-NOT: ImplicitDeinit.__isolated_deallocating_deinit
121121
// CHECK-SYMB-NOT: @$s16deinit_isolation14ImplicitDeinitCfZ
@@ -127,7 +127,7 @@ class ImplicitDeinit {
127127
}
128128

129129
// CHECK-LABEL: @FirstActor class ExplicitDeinit {
130-
// CHECK: @objc @FirstActor deinit
130+
// CHECK: {{(@objc )?}}@FirstActor deinit
131131
// CHECK: }
132132
// CHECK-SYMB: // ExplicitDeinit.__isolated_deallocating_deinit
133133
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation14ExplicitDeinitCfZ : $@convention(thin) (@owned ExplicitDeinit) -> () {
@@ -142,7 +142,7 @@ class ExplicitDeinit {
142142
}
143143

144144
// CHECK-LABEL: @FirstActor class NonisolatedDeinit {
145-
// CHECK: @objc nonisolated deinit
145+
// CHECK: {{(@objc )?}}nonisolated deinit
146146
// CHECK: }
147147
// CHECK-SYMB-NOT: NonisolatedDeinit.__isolated_deallocating_deinit
148148
// CHECK-SYMB-NOT: @$s16deinit_isolation17NonisolatedDeinitCfZ
@@ -159,7 +159,7 @@ class NonisolatedDeinit {
159159
}
160160

161161
// CHECK-LABEL: class IsolatedDeinit {
162-
// CHECK: @objc @FirstActor deinit
162+
// CHECK: {{(@objc )?}}@FirstActor deinit
163163
// CHECK: }
164164
// CHECK-SYMB: // IsolatedDeinit.__isolated_deallocating_deinit
165165
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation14IsolatedDeinitCfZ : $@convention(thin) (@owned IsolatedDeinit) -> () {
@@ -173,7 +173,7 @@ class IsolatedDeinit {
173173
}
174174

175175
// CHECK-LABEL: @FirstActor class DifferentIsolatedDeinit {
176-
// CHECK: @objc @SecondActor deinit
176+
// CHECK: {{(@objc )?}}@SecondActor deinit
177177
// CHECK: }
178178
// CHECK-SYMB: // DifferentIsolatedDeinit.__isolated_deallocating_deinit
179179
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation23DifferentIsolatedDeinitCfZ : $@convention(thin) (@owned DifferentIsolatedDeinit) -> () {
@@ -192,7 +192,7 @@ class DifferentIsolatedDeinit {
192192
// MARK: - Part 2.2 - Base class with nonisolated deinit
193193

194194
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ImplicitDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
195-
// CHECK: @objc deinit
195+
// CHECK: {{(@objc )?}}deinit
196196
// CHECK: }
197197
// CHECK-SYMB-NOT: ImplicitDeinitInheritNonisolated.__isolated_deallocating_deinit
198198
// CHECK-SYMB-NOT: @$s16deinit_isolation32ImplicitDeinitInheritNonisolatedCfZ
@@ -204,7 +204,7 @@ class ImplicitDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
204204
}
205205

206206
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ExplicitDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
207-
// CHECK: @objc @FirstActor deinit
207+
// CHECK: {{(@objc )?}}@FirstActor deinit
208208
// CHECK: }
209209
// CHECK-SYMB: // ExplicitDeinitInheritNonisolated.__isolated_deallocating_deinit
210210
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation32ExplicitDeinitInheritNonisolatedCfZ : $@convention(thin) (@owned ExplicitDeinitInheritNonisolated) -> () {
@@ -219,7 +219,7 @@ class ExplicitDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
219219
}
220220

221221
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class NonisolatedDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
222-
// CHECK: @objc nonisolated deinit
222+
// CHECK: {{(@objc )?}}nonisolated deinit
223223
// CHECK: }
224224
// CHECK-SYMB-NOT: NonisolatedDeinitInheritNonisolated.__isolated_deallocating_deinit
225225
// CHECK-SYMB-NOT: @$s16deinit_isolation024NonisolatedDeinitInheritC0CfZ
@@ -236,7 +236,7 @@ class NonisolatedDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
236236
}
237237

238238
// CHECK-LABEL: @_inheritsConvenienceInitializers class IsolatedDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
239-
// CHECK: @objc @FirstActor deinit
239+
// CHECK: {{(@objc )?}}@FirstActor deinit
240240
// CHECK: }
241241
// CHECK-SYMB: // IsolatedDeinitInheritNonisolated.__isolated_deallocating_deinit
242242
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation32IsolatedDeinitInheritNonisolatedCfZ : $@convention(thin) (@owned IsolatedDeinitInheritNonisolated) -> () {
@@ -250,7 +250,7 @@ class IsolatedDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
250250
}
251251

252252
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class DifferentIsolatedDeinitInheritNonisolated : BaseWithNonisolatedDeinit {
253-
// CHECK: @objc @SecondActor deinit
253+
// CHECK: {{(@objc )?}}@SecondActor deinit
254254
// CHECK: }
255255
// CHECK-SYMB: // DifferentIsolatedDeinitInheritNonisolated.__isolated_deallocating_deinit
256256
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation41DifferentIsolatedDeinitInheritNonisolatedCfZ : $@convention(thin) (@owned DifferentIsolatedDeinitInheritNonisolated) -> () {
@@ -269,7 +269,7 @@ class DifferentIsolatedDeinitInheritNonisolated: BaseWithNonisolatedDeinit {
269269
// MARK: - Part 2.3 - Base class with isolated deinit
270270

271271
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ImplicitDeinitInheritIsolated1 : BaseWithDeinitIsolatedOnFirstActor {
272-
// CHECK: @objc @FirstActor deinit
272+
// CHECK: {{(@objc )?}}@FirstActor deinit
273273
// CHECK: }
274274
// CHECK-SYMB: // ImplicitDeinitInheritIsolated1.__isolated_deallocating_deinit
275275
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation30ImplicitDeinitInheritIsolated1CfZ : $@convention(thin) (@owned ImplicitDeinitInheritIsolated1) -> () {
@@ -281,7 +281,7 @@ class ImplicitDeinitInheritIsolated1: BaseWithDeinitIsolatedOnFirstActor {
281281
}
282282

283283
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ExplicitDeinitIsolated1 : BaseWithDeinitIsolatedOnFirstActor {
284-
// CHECK: @objc @FirstActor deinit
284+
// CHECK: {{(@objc )?}}@FirstActor deinit
285285
// CHECK: }
286286
// CHECK-SYMB: // ExplicitDeinitIsolated1.__isolated_deallocating_deinit
287287
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation23ExplicitDeinitIsolated1CfZ : $@convention(thin) (@owned ExplicitDeinitIsolated1) -> () {
@@ -306,7 +306,7 @@ class NonisolatedDeinitIsolated1: BaseWithDeinitIsolatedOnFirstActor {
306306
#endif
307307

308308
// CHECK-LABEL: @_inheritsConvenienceInitializers class IsolatedDeinitIsolated1 : BaseWithDeinitIsolatedOnFirstActor {
309-
// CHECK: @objc @FirstActor deinit
309+
// CHECK: {{(@objc )?}}@FirstActor deinit
310310
// CHECK: }
311311
// CHECK-SYMB: // IsolatedDeinitIsolated1.__isolated_deallocating_deinit
312312
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation23IsolatedDeinitIsolated1CfZ : $@convention(thin) (@owned IsolatedDeinitIsolated1) -> () {
@@ -332,7 +332,7 @@ class DifferentIsolatedDeinitIsolated1: BaseWithDeinitIsolatedOnFirstActor {
332332
// MARK: - Part 2.4 - Base class with isolated deinit with different actor
333333

334334
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ImplicitDeinitInheritIsolated2 : BaseWithDeinitIsolatedOnSecondActor {
335-
// CHECK: @objc @SecondActor deinit
335+
// CHECK: {{(@objc )?}}@SecondActor deinit
336336
// CHECK: }
337337
// CHECK-SYMB: // ImplicitDeinitInheritIsolated2.__isolated_deallocating_deinit
338338
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation30ImplicitDeinitInheritIsolated2CfZ : $@convention(thin) (@owned ImplicitDeinitInheritIsolated2) -> () {
@@ -344,7 +344,7 @@ class ImplicitDeinitInheritIsolated2: BaseWithDeinitIsolatedOnSecondActor {
344344
}
345345

346346
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class ExplicitDeinitIsolated2 : BaseWithDeinitIsolatedOnSecondActor {
347-
// CHECK: @objc @SecondActor deinit
347+
// CHECK: {{(@objc )?}}@SecondActor deinit
348348
// CHECK: }
349349
// CHECK-SYMB: // ExplicitDeinitIsolated2.__isolated_deallocating_deinit
350350
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation23ExplicitDeinitIsolated2CfZ : $@convention(thin) (@owned ExplicitDeinitIsolated2) -> () {
@@ -380,7 +380,7 @@ class IsolatedDeinitIsolated2: BaseWithDeinitIsolatedOnSecondActor {
380380
#endif
381381

382382
// CHECK-LABEL: @_inheritsConvenienceInitializers @FirstActor class DifferentIsolatedDeinitIsolated2 : BaseWithDeinitIsolatedOnSecondActor {
383-
// CHECK: @objc @SecondActor deinit
383+
// CHECK: {{(@objc )?}}@SecondActor deinit
384384
// CHECK: }
385385
// CHECK-SYMB: // DifferentIsolatedDeinitIsolated2.__isolated_deallocating_deinit
386386
// CHECK-SYMB-NEXT: sil hidden [ossa] @$s16deinit_isolation32DifferentIsolatedDeinitIsolated2CfZ : $@convention(thin) (@owned DifferentIsolatedDeinitIsolated2) -> () {

‎test/Concurrency/deinit_isolation_import/test.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
// RUN: cp -R $INPUT_DIR/Beta.framework %t/Frameworks/
1111
// RUN: %empty-directory(%t/Frameworks/Beta.framework/Headers/)
1212
// RUN: cp $INPUT_DIR/Beta.h %t/Frameworks/Beta.framework/Headers/Beta.h
13-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -typecheck -verify %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks
14-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck %s
15-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck -check-prefix=CHECK-SYMB %s
13+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -typecheck -verify %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks
14+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck %s
15+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s -F %t/Frameworks -F %clang-importer-sdk-path/frameworks | %FileCheck -check-prefix=CHECK-SYMB %s
1616

1717
// REQUIRES: concurrency
1818
// REQUIRES: objc_interop

‎test/Concurrency/deinit_isolation_objc.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library -emit-silgen -verify %s
2-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
3-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
1+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -parse-as-library -emit-silgen -verify %s
2+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck %s
3+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -disable-availability-checking -parse-as-library -emit-silgen -DSILGEN %s | %FileCheck -check-prefix=CHECK-SYMB %s
44

55
// REQUIRES: concurrency
66
// REQUIRES: objc_interop

‎test/Concurrency/deinit_isolation_tbd.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -emit-ir %s | %FileCheck %s
22

3-
import Foundation
4-
53
public class Foo {
64
@MainActor
75
deinit {}

‎test/Distributed/Runtime/distributed_actor_deinit.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library) | %FileCheck %s
22

3+
// REQUIRES: libdispatch
34
// REQUIRES: executable_test
45
// REQUIRES: concurrency
56
// REQUIRES: distributed
@@ -38,8 +39,7 @@ func isMainThread() -> Bool {
3839

3940
// Look up a symbol using dlsym and cast the result to an arbitrary type.
4041
func lookup<T>(_ name: String) -> T {
41-
let RTLD_DEFAULT = UnsafeMutableRawPointer(bitPattern: -2)
42-
let result = dlsym(RTLD_DEFAULT, name)
42+
let result = pointerToSwiftConcurrencySymbol(name: name)
4343
return unsafeBitCast(result, to: T.self)
4444
}
4545

‎test/SourceKit/InterfaceGen/gen_swift_module.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ func f(s : inout [Int]) {
66

77
// RUN: %empty-directory(%t.mod)
88
// RUN: %empty-directory(%t.mod/mcp)
9-
// RUN: %swift -emit-module -o %t.mod/swift_mod.swiftmodule %S/Inputs/swift_mod.swift -parse-as-library -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import
9+
// RUN: %swift -emit-module -o %t.mod/swift_mod.swiftmodule %S/Inputs/swift_mod.swift -parse-as-library -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -disable-objc-interop
1010
// RUN: %sourcekitd-test -req=interface-gen -module swift_mod -- -Xfrontend -disable-implicit-concurrency-module-import -Xfrontend -disable-implicit-string-processing-module-import -I %t.mod > %t.response
1111
// RUN: %diff -u %s.response %t.response
1212

@@ -30,6 +30,6 @@ func f(s : inout [Int]) {
3030
// Test we can generate the interface of a module loaded via a .swiftinterface file correctly
3131

3232
// RUN: %empty-directory(%t.mod)
33-
// RUN: %swift -emit-module -o /dev/null -emit-module-interface-path %t.mod/swift_mod.swiftinterface -O %S/Inputs/swift_mod.swift -parse-as-library -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import
33+
// RUN: %swift -emit-module -o /dev/null -emit-module-interface-path %t.mod/swift_mod.swiftinterface -O %S/Inputs/swift_mod.swift -parse-as-library -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -disable-objc-interop
3434
// RUN: %sourcekitd-test -req=interface-gen -module swift_mod -- -Xfrontend -disable-implicit-concurrency-module-import -Xfrontend -disable-implicit-string-processing-module-import -I %t.mod -module-cache-path %t.mod/mcp > %t.response
3535
// RUN: %diff -u %s.from_swiftinterface.response %t.response

0 commit comments

Comments
 (0)