Skip to content

Commit ee8a115

Browse files
tshortlitshortli
committed
Concurrency: Promote BuiltinCreateTask feature to baseline.
1 parent 7e181d1 commit ee8a115

File tree

7 files changed

+1
-114
lines changed

7 files changed

+1
-114
lines changed

‎include/swift/Basic/Features.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ CONDITIONALLY_SUPPRESSIBLE_LANGUAGE_FEATURE(OptionalIsolatedParameters, 420, "Op
187187
SUPPRESSIBLE_LANGUAGE_FEATURE(Extern, 0, "@_extern")
188188
LANGUAGE_FEATURE(ExpressionMacroDefaultArguments, 422, "Expression macro as caller-side default argument")
189189
LANGUAGE_FEATURE(BuiltinStoreRaw, 0, "Builtin.storeRaw")
190-
LANGUAGE_FEATURE(BuiltinCreateTask, 0, "Builtin.createTask and Builtin.createDiscardingTask")
190+
BASELINE_LANGUAGE_FEATURE(BuiltinCreateTask, 0, "Builtin.createTask and Builtin.createDiscardingTask")
191191
SUPPRESSIBLE_LANGUAGE_FEATURE(AssociatedTypeImplements, 0, "@_implements on associated types")
192192
LANGUAGE_FEATURE(BuiltinAddressOfRawLayout, 0, "Builtin.addressOfRawLayout")
193193
LANGUAGE_FEATURE(MoveOnlyPartialConsumption, 429, "Partial consumption of noncopyable values")

‎lib/AST/FeatureSet.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ static bool usesFeatureRethrowsProtocol(Decl *decl) {
126126

127127
UNINTERESTING_FEATURE(BuiltinUnprotectedStackAlloc)
128128
UNINTERESTING_FEATURE(BuiltinAllocVector)
129-
UNINTERESTING_FEATURE(BuiltinCreateTask)
130129

131130
static bool usesFeatureNewCxxMethodSafetyHeuristics(Decl *decl) {
132131
return decl->hasClangNode();

‎stdlib/public/Concurrency/DiscardingTaskGroup.swift

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -223,17 +223,13 @@ public struct DiscardingTaskGroup {
223223
#endif
224224

225225
// Create the task in this group.
226-
#if $BuiltinCreateTask
227226
let builtinSerialExecutor =
228227
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
229228

230229
_ = Builtin.createDiscardingTask(flags: flags,
231230
initialSerialExecutor: builtinSerialExecutor,
232231
taskGroup: _group,
233232
operation: operation)
234-
#else
235-
_ = Builtin.createAsyncDiscardingTaskInGroup(flags, _group, operation)
236-
#endif
237233
}
238234

239235
/// Adds a child task to the group, unless the group has been canceled.
@@ -275,17 +271,13 @@ public struct DiscardingTaskGroup {
275271
#endif
276272

277273
// Create the task in this group.
278-
#if $BuiltinCreateTask
279274
let builtinSerialExecutor =
280275
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
281276

282277
_ = Builtin.createDiscardingTask(flags: flags,
283278
initialSerialExecutor: builtinSerialExecutor,
284279
taskGroup: _group,
285280
operation: operation)
286-
#else
287-
_ = Builtin.createAsyncDiscardingTaskInGroup(flags, _group, operation)
288-
#endif
289281

290282
return true
291283
}
@@ -302,17 +294,13 @@ public struct DiscardingTaskGroup {
302294
)
303295

304296
// Create the task in this group.
305-
#if $BuiltinCreateTask
306297
let builtinSerialExecutor =
307298
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
308299

309300
_ = Builtin.createDiscardingTask(flags: flags,
310301
initialSerialExecutor: builtinSerialExecutor,
311302
taskGroup: _group,
312303
operation: operation)
313-
#else
314-
_ = Builtin.createAsyncDiscardingTaskInGroup(flags, _group, operation)
315-
#endif
316304
}
317305

318306
/// Adds a child task to the group, unless the group has been canceled.
@@ -344,17 +332,13 @@ public struct DiscardingTaskGroup {
344332
)
345333

346334
// Create the task in this group.
347-
#if $BuiltinCreateTask
348335
let builtinSerialExecutor =
349336
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
350337

351338
_ = Builtin.createDiscardingTask(flags: flags,
352339
initialSerialExecutor: builtinSerialExecutor,
353340
taskGroup: _group,
354341
operation: operation)
355-
#else
356-
_ = Builtin.createAsyncDiscardingTaskInGroup(flags, _group, operation)
357-
#endif
358342

359343
return true
360344
#else
@@ -809,17 +793,13 @@ public struct ThrowingDiscardingTaskGroup<Failure: Error> {
809793
)
810794

811795
// Create the task in this group.
812-
#if $BuiltinCreateTask
813796
let builtinSerialExecutor =
814797
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
815798

816799
_ = Builtin.createDiscardingTask(flags: flags,
817800
initialSerialExecutor: builtinSerialExecutor,
818801
taskGroup: _group,
819802
operation: operation)
820-
#else
821-
_ = Builtin.createAsyncDiscardingTaskInGroup(flags, _group, operation)
822-
#endif
823803
#else
824804
fatalError("Unsupported Swift compiler")
825805
#endif
@@ -849,17 +829,13 @@ public struct ThrowingDiscardingTaskGroup<Failure: Error> {
849829
)
850830

851831
// Create the task in this group.
852-
#if $BuiltinCreateTask
853832
let builtinSerialExecutor =
854833
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
855834

856835
_ = Builtin.createDiscardingTask(flags: flags,
857836
initialSerialExecutor: builtinSerialExecutor,
858837
taskGroup: _group,
859838
operation: operation)
860-
#else
861-
_ = Builtin.createAsyncDiscardingTaskInGroup(flags, _group, operation)
862-
#endif
863839

864840
return true
865841
#else

‎stdlib/public/Concurrency/Task+TaskExecutor.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ extension Task where Failure == Never {
229229
self = Self.init(priority: priority, operation: operation)
230230
return
231231
}
232-
#if $BuiltinCreateAsyncTaskWithExecutor && $BuiltinCreateTask
233232
// Set up the job flags for a new task.
234233
let flags = taskCreateFlags(
235234
priority: priority, isChildTask: false, copyTaskLocals: true,
@@ -243,9 +242,6 @@ extension Task where Failure == Never {
243242
operation: operation)
244243

245244
self._task = task
246-
#else
247-
fatalError("Unsupported Swift compiler, missing support for BuiltinCreateAsyncTaskWithExecutor or $BuiltinCreateTask")
248-
#endif
249245
}
250246
}
251247

@@ -289,7 +285,6 @@ extension Task where Failure == Error {
289285
self = Self.init(priority: priority, operation: operation)
290286
return
291287
}
292-
#if $BuiltinCreateAsyncTaskWithExecutor && $BuiltinCreateTask
293288
// Set up the job flags for a new task.
294289
let flags = taskCreateFlags(
295290
priority: priority, isChildTask: false, copyTaskLocals: true,
@@ -303,9 +298,6 @@ extension Task where Failure == Error {
303298
operation: operation)
304299

305300
self._task = task
306-
#else
307-
fatalError("Unsupported Swift compiler, missing support for BuiltinCreateAsyncTaskWithExecutor or $BuiltinCreateTask")
308-
#endif
309301
}
310302
}
311303

@@ -347,7 +339,6 @@ extension Task where Failure == Never {
347339
guard let taskExecutor else {
348340
return Self.detached(priority: priority, operation: operation)
349341
}
350-
#if $BuiltinCreateAsyncTaskWithExecutor && $BuiltinCreateTask
351342
// Set up the job flags for a new task.
352343
let flags = taskCreateFlags(
353344
priority: priority, isChildTask: false, copyTaskLocals: false,
@@ -362,9 +353,6 @@ extension Task where Failure == Never {
362353
operation: operation)
363354

364355
return Task(task)
365-
#else
366-
fatalError("Unsupported Swift compiler, missing support for BuiltinCreateAsyncTaskWithExecutor or $BuiltinCreateTask")
367-
#endif
368356
}
369357
}
370358

@@ -406,7 +394,6 @@ extension Task where Failure == Error {
406394
guard let taskExecutor else {
407395
return Self.detached(priority: priority, operation: operation)
408396
}
409-
#if $BuiltinCreateAsyncTaskWithExecutor && $BuiltinCreateTask
410397
// Set up the job flags for a new task.
411398
let flags = taskCreateFlags(
412399
priority: priority, isChildTask: false, copyTaskLocals: false,
@@ -420,9 +407,6 @@ extension Task where Failure == Error {
420407
operation: operation)
421408

422409
return Task(task)
423-
#else
424-
fatalError("Unsupported Swift compiler, missing support for BuiltinCreateAsyncTaskWithExecutor or $BuiltinCreateTask")
425-
#endif
426410
}
427411
}
428412

‎stdlib/public/Concurrency/Task.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -679,17 +679,13 @@ extension Task where Failure == Never {
679679
isDiscardingTask: false)
680680

681681
// Create the asynchronous task.
682-
#if $BuiltinCreateTask
683682
let builtinSerialExecutor =
684683
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
685684

686685
let (task, _) = Builtin.createTask(flags: flags,
687686
initialSerialExecutor:
688687
builtinSerialExecutor,
689688
operation: operation)
690-
#else
691-
let (task, _) = Builtin.createAsyncTask(flags, operation)
692-
#endif
693689

694690
self._task = task
695691
#else
@@ -775,17 +771,13 @@ extension Task where Failure == Error {
775771
isDiscardingTask: false)
776772

777773
// Create the asynchronous task future.
778-
#if $BuiltinCreateTask
779774
let builtinSerialExecutor =
780775
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
781776

782777
let (task, _) = Builtin.createTask(flags: flags,
783778
initialSerialExecutor:
784779
builtinSerialExecutor,
785780
operation: operation)
786-
#else
787-
let (task, _) = Builtin.createAsyncTask(flags, operation)
788-
#endif
789781

790782
self._task = task
791783
#else
@@ -870,17 +862,13 @@ extension Task where Failure == Never {
870862
isDiscardingTask: false)
871863

872864
// Create the asynchronous task future.
873-
#if $BuiltinCreateTask
874865
let builtinSerialExecutor =
875866
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
876867

877868
let (task, _) = Builtin.createTask(flags: flags,
878869
initialSerialExecutor:
879870
builtinSerialExecutor,
880871
operation: operation)
881-
#else
882-
let (task, _) = Builtin.createAsyncTask(flags, operation)
883-
#endif
884872

885873
return Task(task)
886874
#else
@@ -965,17 +953,13 @@ extension Task where Failure == Error {
965953
isDiscardingTask: false)
966954

967955
// Create the asynchronous task future.
968-
#if $BuiltinCreateTask
969956
let builtinSerialExecutor =
970957
Builtin.extractFunctionIsolation(operation)?.unownedExecutor.executor
971958

972959
let (task, _) = Builtin.createTask(flags: flags,
973960
initialSerialExecutor:
974961
builtinSerialExecutor,
975962
operation: operation)
976-
#else
977-
let (task, _) = Builtin.createAsyncTask(flags, operation)
978-
#endif
979963

980964
return Task(task)
981965
#else

0 commit comments

Comments
 (0)