Skip to content

Commit 7b37554

Browse files
committed
[Concurrency] Initial TaskGroup implementation working
1 parent e294c7c commit 7b37554

28 files changed

+1626
-1123
lines changed

docs/SIL.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ the coroutine until the continuation is invoked to resume it. A use of
656656

657657
func waitForCallback() async -> Int {
658658
return await withUnsafeContinuation { cc in
659-
registerCallback { cc.resume(returning: $0) }
659+
registerCallback { cc.resume($0) }
660660
}
661661
}
662662

include/swift/ABI/MetadataValues.h

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,15 +1925,9 @@ class JobFlags : public FlagSet<size_t> {
19251925

19261926
// Kind-specific flags.
19271927

1928-
Task_IsChildTask = 24,
1929-
Task_IsFuture = 25,
1930-
// A TaskGroup is a Channel Task which allows children to offer values into
1931-
// it as they complete
1932-
Task_IsChannel = 26,
1933-
// A child task started in a TaskGroup.
1934-
// Its parent MUST be the group's channel task,
1935-
// and the child task MUST offer its completion value into it when it completes.
1936-
Task_IsGroupChild = 27,
1928+
Task_IsChildTask = 24,
1929+
Task_IsFuture = 25,
1930+
Task_IsTaskGroup = 26,
19371931
};
19381932

19391933
explicit JobFlags(size_t bits) : FlagSet(bits) {}
@@ -1961,12 +1955,9 @@ class JobFlags : public FlagSet<size_t> {
19611955
task_isFuture,
19621956
task_setIsFuture)
19631957

1964-
FLAGSET_DEFINE_FLAG_ACCESSORS(Task_IsChannel,
1965-
task_isChannel,
1966-
task_setIsChannel)
1967-
FLAGSET_DEFINE_FLAG_ACCESSORS(Task_IsGroupChild,
1968-
task_isGroupChild,
1969-
task_setGroupChild)
1958+
FLAGSET_DEFINE_FLAG_ACCESSORS(Task_IsTaskGroup,
1959+
task_isTaskGroup,
1960+
task_setIsTaskGroup)
19701961

19711962
};
19721963

0 commit comments

Comments
 (0)