Skip to content

Commit bd56877

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 5532b70 commit bd56877

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
@@ -2775,7 +2775,7 @@ static bool usesFeatureBuiltinContinuation(Decl *decl) {
27752775
return false;
27762776
}
27772777

2778-
static bool usesFeatureBuiltinTaskGroup(Decl *decl) {
2778+
static bool usesFeatureBuiltinTaskGroupWithArgument(Decl *decl) {
27792779
return false;
27802780
}
27812781

stdlib/public/Concurrency/TaskGroup.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public func withTaskGroup<ChildTaskResult, GroupResult>(
6868
returning returnType: GroupResult.Type = GroupResult.self,
6969
body: (inout TaskGroup<ChildTaskResult>) async -> GroupResult
7070
) async -> GroupResult {
71-
#if compiler(>=5.5) && $BuiltinTaskGroup
71+
#if compiler(>=5.5) && $BuiltinTaskGroupWithArgument
7272

7373
let _group = Builtin.createTaskGroup(ChildTaskResult.self)
7474
var group = TaskGroup<ChildTaskResult>(group: _group)
@@ -147,7 +147,7 @@ public func withThrowingTaskGroup<ChildTaskResult, GroupResult>(
147147
returning returnType: GroupResult.Type = GroupResult.self,
148148
body: (inout ThrowingTaskGroup<ChildTaskResult, Error>) async throws -> GroupResult
149149
) async rethrows -> GroupResult {
150-
#if compiler(>=5.5) && $BuiltinTaskGroup
150+
#if compiler(>=5.5) && $BuiltinTaskGroupWithArgument
151151

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

0 commit comments

Comments
 (0)