Skip to content

Commit 5e7170b

Browse files
committed
Change the feature name for BuiltinTaskGroup.
The `createTaskGroup` builtin has changed its signature and now requires a type metadata argument. Change the feature accordingly so that compilers with the new and old versions have disjoint feature sets. Fixes rdar://79561865.
1 parent 4934207 commit 5e7170b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

include/swift/Basic/Features.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ LANGUAGE_FEATURE(BuiltinJob, 0, "Builtin.Job type", true)
4747
LANGUAGE_FEATURE(Sendable, 0, "Sendable and @Sendable", true)
4848
LANGUAGE_FEATURE(BuiltinExecutor, 0, "Builtin.Executor type", true)
4949
LANGUAGE_FEATURE(BuiltinContinuation, 0, "Continuation builtins", true)
50-
LANGUAGE_FEATURE(BuiltinTaskGroup, 0, "TaskGroup builtins", true)
50+
LANGUAGE_FEATURE(BuiltinTaskGroupWithArgument, 0, "TaskGroup builtins", true)
5151
LANGUAGE_FEATURE(InheritActorContext, 0, "@_inheritActorContext attribute", true)
5252
LANGUAGE_FEATURE(ImplicitSelfCapture, 0, "@_implicitSelfCapture attribute", true)
5353
LANGUAGE_FEATURE(BuiltinBuildExecutor, 0, "Executor-building builtins", true)

lib/AST/ASTPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2781,7 +2781,7 @@ static bool usesFeatureBuiltinContinuation(Decl *decl) {
27812781
return false;
27822782
}
27832783

2784-
static bool usesFeatureBuiltinTaskGroup(Decl *decl) {
2784+
static bool usesFeatureBuiltinTaskGroupWithArgument(Decl *decl) {
27852785
return false;
27862786
}
27872787

stdlib/public/Concurrency/TaskGroup.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public func withTaskGroup<ChildTaskResult, GroupResult>(
7373
returning returnType: GroupResult.Type = GroupResult.self,
7474
body: (inout TaskGroup<ChildTaskResult>) async -> GroupResult
7575
) async -> GroupResult {
76-
#if compiler(>=5.5) && $BuiltinTaskGroup
76+
#if compiler(>=5.5) && $BuiltinTaskGroupWithArgument
7777

7878
let _group = Builtin.createTaskGroup(ChildTaskResult.self)
7979
var group = TaskGroup<ChildTaskResult>(group: _group)
@@ -167,7 +167,7 @@ public func withThrowingTaskGroup<ChildTaskResult, GroupResult>(
167167
returning returnType: GroupResult.Type = GroupResult.self,
168168
body: (inout ThrowingTaskGroup<ChildTaskResult, Error>) async throws -> GroupResult
169169
) async rethrows -> GroupResult {
170-
#if compiler(>=5.5) && $BuiltinTaskGroup
170+
#if compiler(>=5.5) && $BuiltinTaskGroupWithArgument
171171

172172
let _group = Builtin.createTaskGroup(ChildTaskResult.self)
173173
var group = ThrowingTaskGroup<ChildTaskResult, Error>(group: _group)

0 commit comments

Comments
 (0)