Skip to content

Commit b733cbf

Browse files
authored
Merge pull request #3717 from swiftwasm/release/5.5
[pull] swiftwasm-release/5.5 from release/5.5
2 parents 114a384 + 1550a6b commit b733cbf

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

stdlib/public/Concurrency/GlobalExecutor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ static constexpr size_t globalQueueCacheCount =
269269
static_cast<size_t>(JobPriority::UserInteractive) + 1;
270270
static std::atomic<dispatch_queue_t> globalQueueCache[globalQueueCacheCount];
271271

272-
#ifdef SWIFT_CONCURRENCY_BACK_DEPLOYMENT
272+
#if defined(SWIFT_CONCURRENCY_BACK_DEPLOYMENT) || defined(__linux__)
273273
extern "C" void dispatch_queue_set_width(dispatch_queue_t dq, long width);
274274
#endif
275275

@@ -289,7 +289,7 @@ static dispatch_queue_t getGlobalQueue(JobPriority priority) {
289289
if (SWIFT_LIKELY(queue))
290290
return queue;
291291

292-
#ifdef SWIFT_CONCURRENCY_BACK_DEPLOYMENT
292+
#if defined(SWIFT_CONCURRENCY_BACK_DEPLOYMENT) || defined(__linux__)
293293
const int DISPATCH_QUEUE_WIDTH_MAX_LOGICAL_CPUS = -3;
294294

295295
// Create a new cooperative concurrent queue and swap it in.

test/Concurrency/Runtime/async_task_priority_current.swift

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,8 @@ func test_detach() async {
3939
print("a2: \(a2)") // CHECK: a2: TaskPriority(rawValue: 25)
4040
}.get()
4141

42-
await detach(priority: .default) {
43-
let a3 = Task.currentPriority
44-
// The priority of 'a3' may either be 21 (default) or elevated to that of
45-
// the main function, whichever is greater.
46-
print("a3: \(a3)") // CHECK: a3: TaskPriority(rawValue: [[#max(MAIN_PRIORITY,21)]]
47-
}.get()
48-
49-
let a4 = Task.currentPriority
50-
print("a4: \(a4)") // CHECK: a4: TaskPriority(rawValue: [[#MAIN_PRIORITY]])
42+
let a3 = Task.currentPriority
43+
print("a3: \(a3)") // CHECK: a3: TaskPriority(rawValue: [[#MAIN_PRIORITY]])
5144
}
5245

5346
@available(SwiftStdlib 5.5, *)

utils/update_checkout/update-checkout-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
"llbuild": "main",
145145
"swift-tools-support-core": "main",
146146
"swiftpm": "main",
147-
"swift-argument-parser": "0.4.1",
147+
"swift-argument-parser": "0.4.3",
148148
"swift-crypto": "1.1.5",
149149
"swift-driver": "main",
150150
"swift-syntax": "main",

0 commit comments

Comments
 (0)