Skip to content

Commit 62a3980

Browse files
authored
Merge pull request #68640 from finagolfin/release/5.10
[5.10][build] Move libdispatch earlier in the build so it can be used by the compiler validation suite
2 parents 6447a98 + 8cda58f commit 62a3980

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

test/Concurrency/Runtime/async_task_priority_current.swift

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,10 @@
1010

1111
import Dispatch
1212

13-
// Work around the inability of older Swift runtimes to print a task priority.
14-
extension TaskPriority: CustomStringConvertible {
15-
public var description: String {
16-
"TaskPriority(rawValue: \(rawValue))"
17-
}
18-
}
19-
2013
@available(SwiftStdlib 5.1, *)
2114
@main struct Main {
2215
static func main() async {
23-
print("main priority: \(Task.currentPriority)") // CHECK: main priority: TaskPriority(rawValue: [[#MAIN_PRIORITY:]])
16+
print("main priority: \(Task.currentPriority)") // CHECK: main priority: TaskPriority.medium
2417
await test_detach()
2518
await test_multiple_lo_indirectly_escalated()
2619
}
@@ -29,18 +22,18 @@ extension TaskPriority: CustomStringConvertible {
2922
@available(SwiftStdlib 5.1, *)
3023
func test_detach() async {
3124
let a1 = Task.currentPriority
32-
print("a1: \(a1)") // CHECK: a1: TaskPriority(rawValue: [[#MAIN_PRIORITY]])
25+
print("a1: \(a1)") // CHECK: a1: TaskPriority.medium
3326

3427
// Note: remember to detach using a higher priority, otherwise a lower one
3528
// might be escalated by the get() and we could see `default` in the detached
3629
// task.
3730
await detach(priority: .userInitiated) {
3831
let a2 = Task.currentPriority
39-
print("a2: \(a2)") // CHECK: a2: TaskPriority(rawValue: 25)
32+
print("a2: \(a2)") // CHECK: a2: TaskPriority.high
4033
}.get()
4134

4235
let a3 = Task.currentPriority
43-
print("a3: \(a3)") // CHECK: a3: TaskPriority(rawValue: [[#MAIN_PRIORITY]])
36+
print("a3: \(a3)") // CHECK: a3: TaskPriority.medium
4437
}
4538

4639
@available(SwiftStdlib 5.1, *)

test/Concurrency/Runtime/custom_executors_complex_equality_crash.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking -parse-as-library)
1+
// RUN: %target-run-simple-swift( -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library)
22

33
// REQUIRES: concurrency
44
// REQUIRES: executable_test

test/lit.cfg

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1645,15 +1645,17 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
16451645
libdispatch_artifact_dir = config.libdispatch_build_path
16461646
libdispatch_swift_module_dir = make_path(libdispatch_artifact_dir, 'src', 'swift', 'swift')
16471647
libdispatch_source_dir = make_path(config.swift_src_root, os.pardir, 'swift-corelibs-libdispatch')
1648+
libdispatch_vfs_yaml = make_path(libdispatch_artifact_dir, 'dispatch-vfs-overlay.yaml')
16481649
libdispatch_artifacts = [
1650+
libdispatch_vfs_yaml,
16491651
make_path(libdispatch_artifact_dir, 'libdispatch.so'),
16501652
make_path(libdispatch_artifact_dir, 'libswiftDispatch.so'),
16511653
make_path(libdispatch_swift_module_dir, 'Dispatch.swiftmodule')]
16521654
if (all(os.path.exists(p) for p in libdispatch_artifacts)):
16531655
config.available_features.add('libdispatch')
16541656
config.libdispatch_artifact_dir = libdispatch_artifact_dir
1655-
config.import_libdispatch = ('-I %s -I %s -L %s'
1656-
% (libdispatch_source_dir, libdispatch_swift_module_dir, libdispatch_artifact_dir))
1657+
config.import_libdispatch = ('-I %s -I %s -L %s -vfsoverlay %s'
1658+
% (libdispatch_source_dir, libdispatch_swift_module_dir, libdispatch_artifact_dir, libdispatch_vfs_yaml))
16571659

16581660
libdispatch_static_artifact_dir = os.path.join(config.libdispatch_static_build_path, 'lib')
16591661
libdispatch_static_artifacts = [

utils/swift_build_support/swift_build_support/build_script_invocation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,13 +613,13 @@ def compute_product_pipelines(self):
613613
is_enabled=self.args.build_swift)
614614
builder.add_impl_product(products.LLDB,
615615
is_enabled=self.args.build_lldb)
616+
builder.add_impl_product(products.LibDispatch,
617+
is_enabled=self.args.build_libdispatch)
616618

617619
# Begin a new build-script-impl pipeline that builds libraries that we
618620
# build as part of build-script-impl but that we should eventually move
619621
# onto build-script products.
620622
builder.begin_impl_pipeline(should_run_epilogue_operations=True)
621-
builder.add_impl_product(products.LibDispatch,
622-
is_enabled=self.args.build_libdispatch)
623623
builder.add_impl_product(products.Foundation,
624624
is_enabled=self.args.build_foundation)
625625
builder.add_impl_product(products.XCTest,

0 commit comments

Comments
 (0)