Skip to content

Commit 7e181d1

Browse files
committed
Concurrency: Promote BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor feature to baseline.
1 parent e5744f0 commit 7e181d1

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
@@ -154,7 +154,7 @@ BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroup, 0, "Task create in task
154154
BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroupWithExecutor, 0, "Task create in task group builtin with extra flags")
155155
BASELINE_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")
157-
LANGUAGE_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor, 0, "Task create in discarding task group with extra executor preference")
157+
BASELINE_LANGUAGE_FEATURE(BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor, 0, "Task create in discarding task group with extra executor preference")
158158
BASELINE_LANGUAGE_FEATURE(BuiltinStackAlloc, 0, "Builtin.stackAlloc")
159159
LANGUAGE_FEATURE(BuiltinUnprotectedStackAlloc, 0, "Builtin.unprotectedStackAlloc")
160160
LANGUAGE_FEATURE(BuiltinAllocVector, 0, "Builtin.allocVector")

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(BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor)
128127
UNINTERESTING_FEATURE(BuiltinUnprotectedStackAlloc)
129128
UNINTERESTING_FEATURE(BuiltinAllocVector)
130129
UNINTERESTING_FEATURE(BuiltinCreateTask)

stdlib/public/Concurrency/TaskGroup+TaskExecutor.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ extension DiscardingTaskGroup {
238238
guard let taskExecutor else {
239239
return self.addTask(priority: priority, operation: operation)
240240
}
241-
#if $BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor
242241
let flags = taskCreateFlags(
243242
priority: priority, isChildTask: true, copyTaskLocals: false,
244243
inheritContext: false, enqueueJob: true,
@@ -258,9 +257,6 @@ extension DiscardingTaskGroup {
258257
#else
259258
_ = Builtin.createAsyncDiscardingTaskInGroupWithExecutor(flags, _group, executorBuiltin, operation)
260259
#endif
261-
#else
262-
fatalError("Unsupported Swift compiler")
263-
#endif
264260
}
265261

266262
/// Adds a child task to the group and set it up with the passed in task executor preference,
@@ -288,7 +284,6 @@ extension DiscardingTaskGroup {
288284
guard let taskExecutor else {
289285
return self.addTaskUnlessCancelled(priority: priority, operation: operation)
290286
}
291-
#if $BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor
292287
let canAdd = _taskGroupAddPendingTask(group: _group, unconditionally: false)
293288

294289
guard canAdd else {
@@ -315,9 +310,6 @@ extension DiscardingTaskGroup {
315310
_ = Builtin.createAsyncDiscardingTaskInGroupWithExecutor(flags, _group, executorBuiltin, operation)
316311
#endif
317312
return true
318-
#else
319-
fatalError("Unsupported Swift compiler")
320-
#endif
321313
}
322314
}
323315

@@ -348,7 +340,6 @@ extension ThrowingDiscardingTaskGroup {
348340
guard let taskExecutor else {
349341
return self.addTask(priority: priority, operation: operation)
350342
}
351-
#if $BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor
352343
let flags = taskCreateFlags(
353344
priority: priority, isChildTask: true, copyTaskLocals: false,
354345
inheritContext: false, enqueueJob: true,
@@ -368,9 +359,6 @@ extension ThrowingDiscardingTaskGroup {
368359
#else
369360
_ = Builtin.createAsyncDiscardingTaskInGroupWithExecutor(flags, _group, executorBuiltin, operation)
370361
#endif
371-
#else
372-
fatalError("Unsupported Swift compiler")
373-
#endif
374362
}
375363

376364
/// Adds a child task to the group and set it up with the passed in task executor preference,
@@ -398,7 +386,6 @@ extension ThrowingDiscardingTaskGroup {
398386
guard let taskExecutor else {
399387
return self.addTaskUnlessCancelled(priority: priority, operation: operation)
400388
}
401-
#if $BuiltinCreateAsyncDiscardingTaskInGroupWithExecutor
402389
let canAdd = _taskGroupAddPendingTask(group: _group, unconditionally: false)
403390

404391
guard canAdd else {
@@ -425,9 +412,6 @@ extension ThrowingDiscardingTaskGroup {
425412
_ = Builtin.createAsyncDiscardingTaskInGroupWithExecutor(flags, _group, executorBuiltin, operation)
426413
#endif
427414
return true
428-
#else
429-
fatalError("Unsupported Swift compiler")
430-
#endif
431415
}
432416
}
433417

0 commit comments

Comments
 (0)