Skip to content

[Concurrency] Fix more missing builtin guards for DiscardingTaskGroup #70851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 11, 2024
Merged

[Concurrency] Fix more missing builtin guards for DiscardingTaskGroup #70851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/swift/Basic/Features.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroup, 0, "Task create in task group bu
LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroupWithExecutor, 0, "Task create in task group builtin with extra flags")
LANGUAGE_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroup, 0, "Task create in discarding task group builtin, accounting for the Void return type")
LANGUAGE_FEATURE(BuiltinCreateAsyncTaskWithExecutor, 0, "Task create builtin with extra executor preference")
LANGUAGE_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor, 0, "Task create in discarding task group with extra executor preference")
LANGUAGE_FEATURE(BuiltinCopy, 0, "Builtin.copy()")
LANGUAGE_FEATURE(BuiltinStackAlloc, 0, "Builtin.stackAlloc")
LANGUAGE_FEATURE(BuiltinUnprotectedStackAlloc, 0, "Builtin.unprotectedStackAlloc")
Expand Down
5 changes: 5 additions & 0 deletions lib/AST/ASTPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3296,6 +3296,11 @@ static bool usesFeatureBuiltinCreateAsyncTaskWithExecutor(Decl *decl) {
return false;
}

static bool
usesFeatureBuiltinCreateAsyncDiscardingTaskInGroupWithExecutor(Decl *decl) {
return false;
}

static bool usesFeatureBuiltinCopy(Decl *decl) { return false; }

static bool usesFeatureBuiltinTaskRunInline(Decl *) { return false; }
Expand Down
10 changes: 5 additions & 5 deletions stdlib/public/Concurrency/TaskGroup+TaskExecutor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ extension DiscardingTaskGroup {
priority: TaskPriority? = nil,
operation: __owned @Sendable @escaping () async throws -> Void
) {
#if $BuiltinCreateAsyncTaskInGroupWithExecutor
#if $BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor
let flags = taskCreateFlags(
priority: priority, isChildTask: true, copyTaskLocals: false,
inheritContext: false, enqueueJob: true,
Expand Down Expand Up @@ -265,7 +265,7 @@ extension DiscardingTaskGroup {
priority: TaskPriority? = nil,
operation: __owned @Sendable @escaping () async -> Void
) -> Bool {
#if $BuiltinCreateAsyncTaskInGroupWithExecutor
#if $BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor
let canAdd = _taskGroupAddPendingTask(group: _group, unconditionally: false)

guard canAdd else {
Expand Down Expand Up @@ -317,7 +317,7 @@ extension ThrowingDiscardingTaskGroup {
priority: TaskPriority? = nil,
operation: __owned @Sendable @escaping () async throws -> Void
) {
#if $BuiltinCreateAsyncTaskInGroupWithExecutor
#if $BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor
let flags = taskCreateFlags(
priority: priority, isChildTask: true, copyTaskLocals: false,
inheritContext: false, enqueueJob: true,
Expand Down Expand Up @@ -359,7 +359,7 @@ extension ThrowingDiscardingTaskGroup {
priority: TaskPriority? = nil,
operation: __owned @Sendable @escaping () async throws -> Void
) -> Bool {
#if $BuiltinCreateAsyncTaskInGroupWithExecutor
#if $BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor
let canAdd = _taskGroupAddPendingTask(group: _group, unconditionally: false)

guard canAdd else {
Expand Down Expand Up @@ -388,4 +388,4 @@ extension ThrowingDiscardingTaskGroup {
}
}

#endif
#endif