Skip to content

Commit 2a09bdb

Browse files
committed
add missing APIs for TaskGroup and cleanup
1 parent 67a29c3 commit 2a09bdb

File tree

5 files changed

+304
-48
lines changed

5 files changed

+304
-48
lines changed

include/swift/Basic/Features.def

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ LANGUAGE_FEATURE(BuiltinBuildTaskExecutor, 0, "TaskExecutor-building builtins",
8787
LANGUAGE_FEATURE(BuiltinBuildExecutor, 0, "Executor-building builtins", true)
8888
LANGUAGE_FEATURE(BuiltinBuildComplexEqualityExecutor, 0, "Executor-building for 'complexEquality executor' builtins", true)
8989
LANGUAGE_FEATURE(BuiltinBuildMainExecutor, 0, "MainActor executor building builtin", true)
90-
LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroup, 0, "Task create builtin with extra flags", true)
90+
LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroup, 0, "Task create in task group builtin with extra flags", true)
91+
LANGUAGE_FEATURE(BuiltinCreateAsyncTaskInGroupWithExecutor, 0, "Task create in task group builtin with extra flags", true)
9192
LANGUAGE_FEATURE(BuiltinCreateAsyncTaskWithExecutor, 0, "Task create builtin with extra executor preference", true)
9293
LANGUAGE_FEATURE(BuiltinCopy, 0, "Builtin.copy()", true)
9394
LANGUAGE_FEATURE(BuiltinStackAlloc, 0, "Builtin.stackAlloc", true)

lib/AST/ASTPrinter.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3145,6 +3145,10 @@ static bool usesFeatureBuiltinCreateAsyncTaskInGroup(Decl *decl) {
31453145
return false;
31463146
}
31473147

3148+
static bool usesFeatureBuiltinCreateAsyncTaskInGroupWithExecutor(Decl *decl) {
3149+
return false;
3150+
}
3151+
31483152
static bool usesFeatureBuiltinCreateAsyncTaskWithExecutor(Decl *decl) {
31493153
return false;
31503154
}

lib/IRGen/GenCall.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4560,8 +4560,6 @@ llvm::Value *irgen::emitTaskCreate(
45604560
llvm::Value *taskOptions = llvm::ConstantInt::get(
45614561
IGF.IGM.SwiftTaskOptionRecordPtrTy, 0);
45624562

4563-
// If there is a task group, emit a task group option structure to contain
4564-
// it.
45654563
// If there is a task group, emit a task group option structure to contain it.
45664564
if (taskGroup) {
45674565
TaskOptionRecordFlags optionsFlags(TaskOptionRecordKind::TaskGroup);
@@ -4587,14 +4585,6 @@ llvm::Value *irgen::emitTaskCreate(
45874585
IGF.Builder.CreateStore(
45884586
taskGroup, IGF.Builder.CreateStructGEP(optionsRecord, 1, Size()));
45894587

4590-
// if (executorIdentity) {
4591-
// auto executorRecord = IGF.Builder.CreateStructGEP(optionsRecord, 1, Size());
4592-
// IGF.Builder.CreateStore(
4593-
// executorIdentity, IGF.Builder.CreateStructGEP(executorRecord, 0, Size()));
4594-
// IGF.Builder.CreateStore(
4595-
// executorImpl, IGF.Builder.CreateStructGEP(executorRecord, 1, Size()));
4596-
// }
4597-
45984588
taskOptions = IGF.Builder.CreateBitOrPointerCast(
45994589
optionsRecord.getAddress(), IGF.IGM.SwiftTaskOptionRecordPtrTy);
46004590
}

0 commit comments

Comments
 (0)