Skip to content

Commit 6c09cc8

Browse files
ktosoktoso
committed
Amend ABI test
1 parent 77d175d commit 6c09cc8

File tree

6 files changed

+57
-53
lines changed

6 files changed

+57
-53
lines changed

‎lib/Sema/TypeCheckConcurrency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5813,7 +5813,7 @@ computeDefaultInferredActorIsolation(ValueDecl *value) {
58135813
IsolationSource(overriddenValue, IsolationSource::Override)},
58145814
overriddenValue,
58155815
isolation}; // use the overridden decl's iso as the default
5816-
// isolation for this decl.
5816+
// isolatiotn for this decl.
58175817
}
58185818

58195819
// We did not find anything special, return unspecified.

‎stdlib/public/Concurrency/SourceCompatibilityShims.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,4 +578,4 @@ public typealias UnsafeThrowingContinuation<T> = UnsafeContinuation<T, Error>
578578

579579
@available(SwiftStdlib 5.1, *)
580580
@available(*, deprecated, renamed: "UnownedJob")
581-
public typealias PartialAsyncTask = UnownedJob
581+
public typealias PartialAsyncTask = UnownedJob

‎stdlib/public/Concurrency/Task+startSynchronously.swift.gyb

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ extension Task where Failure == ${FAILURE_TYPE} {
4949
/// created using ``Task/init``.
5050
///
5151
/// - Parameters:
52+
/// - name: The high-level human-readable name given for this task
5253
/// - priority: The priority of the task.
5354
/// Pass `nil` to use the ``Task/basePriority`` of the current task (if there is one).
5455
/// - operation: the operation to be run immediately upon entering the task.
5556
/// - Returns: A reference to the unstructured task which may be awaited on.
5657
@available(SwiftStdlib 6.2, *)
5758
@discardableResult
5859
public static func startSynchronously(
60+
name: String? = nil,
5961
priority: TaskPriority? = nil,
6062
@_inheritActorContext @_implicitSelfCapture _ operation: __owned sending @escaping () async throws -> Success
6163
) -> Task<Success, ${FAILURE_TYPE}> {
@@ -70,9 +72,27 @@ extension Task where Failure == ${FAILURE_TYPE} {
7072
isSynchronousStart: true
7173
)
7274

73-
let (task, _) = Builtin.createAsyncTask(flags, operation)
74-
_startTaskSynchronously(task)
75-
return Task<Success, ${FAILURE_TYPE}>(task)
75+
var task: Builtin.NativeObject?
76+
#if $BuiltinCreateAsyncTaskName
77+
if let name {
78+
task =
79+
name.utf8CString.withUnsafeBufferPointer { nameBytes in
80+
Builtin.createTask(
81+
flags: flags,
82+
taskName: nameBytes.baseAddress!._rawValue,
83+
operation: operation).0
84+
}
85+
}
86+
#endif
87+
if task == nil {
88+
// either no task name was set, or names are unsupported
89+
task = Builtin.createTask(
90+
flags: flags,
91+
operation: operation).0
92+
}
93+
94+
_startTaskSynchronously(task!)
95+
return Task<Success, ${FAILURE_TYPE}>(task!)
7696
}
7797
}
7898
%end
@@ -147,6 +167,7 @@ extension ${GROUP_TYPE} {
147167
/// created using ``${GROUP_TYPE}/addTask``.
148168
@available(SwiftStdlib 6.2, *)
149169
public func ${METHOD_NAME}( // in ${GROUP_TYPE}
170+
name: String? = nil,
150171
priority: TaskPriority? = nil,
151172
${OPERATION_PARAM}
152173
) {
@@ -225,7 +246,7 @@ extension Task where Failure == ${FAILURE_TYPE} {
225246
// Internal Runtime Functions --------------------------------------------------
226247

227248
@_silgen_name("swift_task_startOnMainActor")
228-
fileprivate func _startTaskOnMainActor(_ task: Builtin.NativeObject)
249+
internal func _startTaskOnMainActor(_ task: Builtin.NativeObject)
229250

230251
@_silgen_name("swift_task_startSynchronously")
231-
fileprivate func _startTaskSynchronously(_ task: Builtin.NativeObject)
252+
internal func _startTaskSynchronously(_ task: Builtin.NativeObject)

‎stdlib/public/Concurrency/Task.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -669,10 +669,14 @@ extension Task where Failure == Never {
669669
) {
670670
// Set up the job flags for a new task.
671671
let flags = taskCreateFlags(
672-
priority: priority, isChildTask: false, copyTaskLocals: true,
673-
inheritContext: true, enqueueJob: true,
672+
priority: priority,
673+
isChildTask: false,
674+
copyTaskLocals: true,
675+
inheritContext: true,
676+
enqueueJob: true,
674677
addPendingGroupTaskUnconditionally: false,
675-
isDiscardingTask: false, isSynchronousStart: false)
678+
isDiscardingTask: false,
679+
isSynchronousStart: false)
676680

677681
// Create the asynchronous task.
678682
let (task, _) = Builtin.createAsyncTask(flags, operation)
@@ -700,7 +704,7 @@ extension Task where Failure == Never {
700704
/// it only makes it impossible for you to explicitly cancel the task.
701705
///
702706
/// - Parameters:
703-
/// - name: The high-level name given for this task
707+
/// - name: The high-level human-readable name given for this task
704708
/// - priority: The priority of the task.
705709
/// Pass `nil` to use the priority from `Task.currentPriority`.
706710
/// - operation: The operation to perform.
@@ -869,7 +873,7 @@ self._task = task
869873
/// it only makes it impossible for you to explicitly cancel the task.
870874
///
871875
/// - Parameters:
872-
/// - name: The high-level name given for this task
876+
/// - name: The high-level human-readable name given for this task
873877
/// - priority: The priority of the task.
874878
/// Pass `nil` to use the priority from `Task.currentPriority`.
875879
/// - operation: The operation to perform.

‎test/abi/macOS/arm64/concurrency.swift

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -388,28 +388,18 @@ Added: _$ss33withTaskPriorityEscalationHandler9operation02onC9Escalated9isolatio
388388
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvgZ
389389
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvpZMV
390390
Added: _swift_task_getCurrentTaskName
391+
Added: _$sScG22startTaskSynchronously4name8priority9operationySSSg_ScPSgxyYacntF
392+
Added: _$sScG37startTaskSynchronouslyUnlessCancelled4name8priority9operationySSSg_ScPSgxyYacntF
393+
Added: _$sScTss5Error_pRs_rlE18startSynchronously4name8priority_ScTyxsAA_pGSSSg_ScPSgxyYaKcntFZ
394+
Added: _$sScTss5NeverORs_rlE18startSynchronously4name8priority_ScTyxABGSSSg_ScPSgxyYaKcntFZ
395+
Added: _$sScg22startTaskSynchronously4name8priority9operationySSSg_ScPSgxyYacntF
396+
Added: _$sScg37startTaskSynchronouslyUnlessCancelled4name8priority9operationySSSg_ScPSgxyYacntF
397+
Added: _$ss19DiscardingTaskGroupV05startB13Synchronously4name8priority9operationySSSg_ScPSgyyYacntF
398+
Added: _$ss19DiscardingTaskGroupV05startB28SynchronouslyUnlessCancelled4name8priority9operationySSSg_ScPSgyyYacntF
399+
Added: _$ss27ThrowingDiscardingTaskGroupV05startC13Synchronously4name8priority9operationySSSg_ScPSgyyYacntF
400+
Added: _$ss27ThrowingDiscardingTaskGroupV05startC28SynchronouslyUnlessCancelled4name8priority9operationySSSg_ScPSgyyYacntF
391401

392402
Added: _swift_task_startSynchronously
393-
// static (extension in Swift):Swift.Task< where B == Swift.Error>.startSynchronously(priority: Swift.TaskPriority?, _: __owned () async throws -> A) -> Swift.Task<A, Swift.Error>
394-
Added: _$sScTss5Error_pRs_rlE18startSynchronously8priority_ScTyxsAA_pGScPSg_xyYaKcntFZ
395-
// static (extension in Swift):Swift.Task< where B == Swift.Never>.startSynchronously(priority: Swift.TaskPriority?, _: __owned () async throws -> A) -> Swift.Task<A, Swift.Never>
396-
Added: _$sScTss5NeverORs_rlE18startSynchronously8priority_ScTyxABGScPSg_xyYaKcntFZ
397-
// Swift.TaskGroup.startTaskSynchronously(priority: Swift.TaskPriority?, operation: __owned () async -> A) -> ()
398-
Added: _$sScG22startTaskSynchronously8priority9operationyScPSg_xyYacntF
399-
// Swift.TaskGroup.startTaskSynchronouslyUnlessCancelled(priority: Swift.TaskPriority?, operation: __owned () async -> A) -> ()
400-
Added: _$sScG37startTaskSynchronouslyUnlessCancelled8priority9operationyScPSg_xyYacntF
401-
// Swift.ThrowingTaskGroup.startTaskSynchronously(priority: Swift.TaskPriority?, operation: __owned () async -> A) -> ()
402-
Added: _$sScg22startTaskSynchronously8priority9operationyScPSg_xyYacntF
403-
// Swift.ThrowingTaskGroup.startTaskSynchronouslyUnlessCancelled(priority: Swift.TaskPriority?, operation: __owned () async -> A) -> ()
404-
Added: _$sScg37startTaskSynchronouslyUnlessCancelled8priority9operationyScPSg_xyYacntF
405-
// Swift.DiscardingTaskGroup.startTaskSynchronously(priority: Swift.TaskPriority?, operation: __owned () async -> ()) -> ()
406-
Added: _$ss19DiscardingTaskGroupV05startB13Synchronously8priority9operationyScPSg_yyYacntF
407-
// Swift.DiscardingTaskGroup.startTaskSynchronouslyUnlessCancelled(priority: Swift.TaskPriority?, operation: __owned () async -> ()) -> ()
408-
Added: _$ss19DiscardingTaskGroupV05startB28SynchronouslyUnlessCancelled8priority9operationyScPSg_yyYacntF
409-
// Swift.ThrowingDiscardingTaskGroup.startTaskSynchronously(priority: Swift.TaskPriority?, operation: __owned () async -> ()) -> ()
410-
Added: _$ss27ThrowingDiscardingTaskGroupV05startC13Synchronously8priority9operationyScPSg_yyYacntF
411-
// Swift.ThrowingDiscardingTaskGroup.startTaskSynchronouslyUnlessCancelled(priority: Swift.TaskPriority?, operation: __owned () async -> ()) -> ()
412-
Added: _$ss27ThrowingDiscardingTaskGroupV05startC28SynchronouslyUnlessCancelled8priority9operationyScPSg_yyYacntF
413403

414404
// add callee-allocated coro entrypoints
415405
// TODO: CoroutineAccessors: several of these symbols should be in swiftCore

‎test/abi/macOS/x86_64/concurrency.swift

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -388,27 +388,16 @@ Added: _$ss33withTaskPriorityEscalationHandler9operation02onC9Escalated9isolatio
388388
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvgZ
389389
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvpZMV
390390
Added: _swift_task_getCurrentTaskName
391-
392-
Added: _swift_task_startSynchronously
393-
// static (extension in Swift):Swift.Task< where B == Swift.Error>.startSynchronously(priority: Swift.TaskPriority?, _: __owned () async throws -> A) -> Swift.Task<A, Swift.Error>
394-
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvgZ
395-
// static (extension in Swift):Swift.Task< where B == Swift.Never>.startSynchronously(priority: Swift.TaskPriority?, _: __owned () async throws -> A) -> Swift.Task<A, Swift.Never>
396-
Added: _$sScTss5NeverORszABRs_rlE4nameSSSgvpZMV
397-
// Swift.TaskGroup.startTaskSynchronously(priority: Swift.TaskPriority?, operation: __owned () async -> A) -> ()
398-
Added: _swift_task_getCurrentTaskName// Swift.TaskGroup.startTaskSynchronouslyUnlessCancelled(priority: Swift.TaskPriority?, operation: __owned () async -> A) -> ()
399-
Added: _$sScG37startTaskSynchronouslyUnlessCancelled8priority9operationyScPSg_xyYacntF
400-
// Swift.ThrowingTaskGroup.startTaskSynchronously(priority: Swift.TaskPriority?, operation: __owned () async -> A) -> ()
401-
Added: _$sScg22startTaskSynchronously8priority9operationyScPSg_xyYacntF
402-
// Swift.ThrowingTaskGroup.startTaskSynchronouslyUnlessCancelled(priority: Swift.TaskPriority?, operation: __owned () async -> A) -> ()
403-
Added: _$sScg37startTaskSynchronouslyUnlessCancelled8priority9operationyScPSg_xyYacntF
404-
// Swift.DiscardingTaskGroup.startTaskSynchronously(priority: Swift.TaskPriority?, operation: __owned () async -> ()) -> ()
405-
Added: _$ss19DiscardingTaskGroupV05startB13Synchronously8priority9operationyScPSg_yyYacntF
406-
// Swift.DiscardingTaskGroup.startTaskSynchronouslyUnlessCancelled(priority: Swift.TaskPriority?, operation: __owned () async -> ()) -> ()
407-
Added: _$ss19DiscardingTaskGroupV05startB28SynchronouslyUnlessCancelled8priority9operationyScPSg_yyYacntF
408-
// Swift.ThrowingDiscardingTaskGroup.startTaskSynchronously(priority: Swift.TaskPriority?, operation: __owned () async -> ()) -> ()
409-
Added: _$ss27ThrowingDiscardingTaskGroupV05startC13Synchronously8priority9operationyScPSg_yyYacntF
410-
// Swift.ThrowingDiscardingTaskGroup.startTaskSynchronouslyUnlessCancelled(priority: Swift.TaskPriority?, operation: __owned () async -> ()) -> ()
411-
Added: _$ss27ThrowingDiscardingTaskGroupV05startC28SynchronouslyUnlessCancelled8priority9operationyScPSg_yyYacntF
391+
Added: _$sScG22startTaskSynchronously4name8priority9operationySSSg_ScPSgxyYacntF
392+
Added: _$sScG37startTaskSynchronouslyUnlessCancelled4name8priority9operationySSSg_ScPSgxyYacntF
393+
Added: _$sScTss5Error_pRs_rlE18startSynchronously4name8priority_ScTyxsAA_pGSSSg_ScPSgxyYaKcntFZ
394+
Added: _$sScTss5NeverORs_rlE18startSynchronously4name8priority_ScTyxABGSSSg_ScPSgxyYaKcntFZ
395+
Added: _$sScg22startTaskSynchronously4name8priority9operationySSSg_ScPSgxyYacntF
396+
Added: _$sScg37startTaskSynchronouslyUnlessCancelled4name8priority9operationySSSg_ScPSgxyYacntF
397+
Added: _$ss19DiscardingTaskGroupV05startB13Synchronously4name8priority9operationySSSg_ScPSgyyYacntF
398+
Added: _$ss19DiscardingTaskGroupV05startB28SynchronouslyUnlessCancelled4name8priority9operationySSSg_ScPSgyyYacntF
399+
Added: _$ss27ThrowingDiscardingTaskGroupV05startC13Synchronously4name8priority9operationySSSg_ScPSgyyYacntF
400+
Added: _$ss27ThrowingDiscardingTaskGroupV05startC28SynchronouslyUnlessCancelled4name8priority9operationySSSg_ScPSgyyYacntF
412401

413402
// add callee-allocated coro entrypoints
414403
// TODO: CoroutineAccessors: several of these symbols should be in swiftCore

0 commit comments

Comments
 (0)