Skip to content

Commit a4d5867

Browse files
committed
Concurrency: Promote BuiltinCreateAsyncTaskInGroupWithExecutor feature to baseline.
1 parent f251965 commit a4d5867

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

include/swift/Basic/Features.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ BASELINE_LANGUAGE_FEATURE(BuiltinBuildExecutor, 0, "Executor-building builtins")
151151
BASELINE_LANGUAGE_FEATURE(BuiltinBuildComplexEqualityExecutor, 0, "Executor-building for 'complexEquality executor' builtins")
152152
BASELINE_LANGUAGE_FEATURE(BuiltinBuildMainExecutor, 0, "MainActor executor building builtin")
153153
BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroup, 0, "Task create in task group builtin with extra flags")
154-
LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroupWithExecutor, 0, "Task create in task group builtin with extra flags")
154+
BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroupWithExecutor, 0, "Task create in task group builtin with extra flags")
155155
LANGUAGE_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroup, 0, "Task create in discarding task group builtin, accounting for the Void return type")
156156
BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskWithExecutor, 0, "Task create builtin with extra executor preference")
157157
LANGUAGE_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor, 0, "Task create in discarding task group with extra executor preference")

lib/AST/FeatureSet.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ static bool usesFeatureRethrowsProtocol(Decl *decl) {
124124
return usesFeatureRethrowsProtocol(decl, checked);
125125
}
126126

127-
UNINTERESTING_FEATURE(BuiltinCreateAsyncTaskInGroupWithExecutor)
128127
UNINTERESTING_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroup)
129128
UNINTERESTING_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor)
130129
UNINTERESTING_FEATURE(BuiltinUnprotectedStackAlloc)

stdlib/public/Concurrency/TaskGroup+TaskExecutor.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ extension TaskGroup {
4040
guard let taskExecutor else {
4141
return self.addTask(priority: priority, operation: operation)
4242
}
43-
#if $BuiltinCreateAsyncTaskInGroupWithExecutor
4443
let flags = taskCreateFlags(
4544
priority: priority, isChildTask: true, copyTaskLocals: false,
4645
inheritContext: false, enqueueJob: true,
@@ -60,9 +59,6 @@ extension TaskGroup {
6059
#else
6160
_ = Builtin.createAsyncTaskInGroupWithExecutor(flags, _group, executorBuiltin, operation)
6261
#endif
63-
#else
64-
fatalError("Unsupported Swift compiler")
65-
#endif
6662
}
6763

6864
/// Adds a child task to the group and enqueue it on the specified executor, unless the group has been canceled.
@@ -89,7 +85,6 @@ extension TaskGroup {
8985
guard let taskExecutor else {
9086
return self.addTaskUnlessCancelled(priority: priority, operation: operation)
9187
}
92-
#if $BuiltinCreateAsyncTaskInGroupWithExecutor
9388
let canAdd = _taskGroupAddPendingTask(group: _group, unconditionally: false)
9489

9590
guard canAdd else {
@@ -116,9 +111,6 @@ extension TaskGroup {
116111
_ = Builtin.createAsyncTaskInGroupWithExecutor(flags, _group, executorBuiltin, operation)
117112
#endif
118113
return true
119-
#else
120-
fatalError("Unsupported Swift compiler")
121-
#endif
122114
}
123115
}
124116

@@ -149,7 +141,6 @@ extension ThrowingTaskGroup {
149141
guard let taskExecutor else {
150142
return self.addTask(priority: priority, operation: operation)
151143
}
152-
#if $BuiltinCreateAsyncTaskInGroupWithExecutor
153144
let flags = taskCreateFlags(
154145
priority: priority, isChildTask: true, copyTaskLocals: false,
155146
inheritContext: false, enqueueJob: true,
@@ -169,9 +160,6 @@ extension ThrowingTaskGroup {
169160
#else
170161
_ = Builtin.createAsyncTaskInGroupWithExecutor(flags, _group, executorBuiltin, operation)
171162
#endif
172-
#else
173-
fatalError("Unsupported Swift compiler")
174-
#endif
175163
}
176164

177165
/// Adds a child task to the group and enqueue it on the specified executor, unless the group has been canceled.
@@ -194,7 +182,6 @@ extension ThrowingTaskGroup {
194182
guard let taskExecutor else {
195183
return self.addTaskUnlessCancelled(priority: priority, operation: operation)
196184
}
197-
#if $BuiltinCreateAsyncTaskInGroupWithExecutor
198185
let canAdd = _taskGroupAddPendingTask(group: _group, unconditionally: false)
199186

200187
guard canAdd else {
@@ -221,9 +208,6 @@ extension ThrowingTaskGroup {
221208
_ = Builtin.createAsyncTaskInGroupWithExecutor(flags, _group, executorBuiltin, operation)
222209
#endif
223210
return true
224-
#else
225-
fatalError("Unsupported Swift compiler")
226-
#endif
227211
}
228212
}
229213

0 commit comments

Comments
 (0)