Skip to content

Commit f1a66a4

Browse files
authored
Merge pull request #2365 from swiftwasm/main
[pull] swiftwasm from main
2 parents 7f8b000 + 81ef1bd commit f1a66a4

File tree

79 files changed

+3590
-912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+3590
-912
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ diligently to make the Swift community welcoming to everyone.
8383
To give clarity of what is expected of our members, Swift has adopted the
8484
code of conduct defined by the Contributor Covenant. This document is used
8585
across many open source communities, and we think it articulates our values
86-
well. For more, see the [Code of Conduct](https://swift.org/community/#code-of-conduct).
86+
well. For more, see the [Code of Conduct](https://swift.org/code-of-conduct/).
8787

8888
## Getting Started
8989

docs/HowToGuides/FirstPullRequest.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ highlighting the parts that you think are important.
7373
Remember that the [Swift Code of Conduct][] applies whenever you are
7474
participating in the Swift project.
7575

76-
[Swift Code of Conduct]: https://swift.org/community/#code-of-conduct
76+
[Swift Code of Conduct]: https://swift.org/code-of-conduct/
7777

7878
### I didn't get a response from someone. What should I do?
7979

include/swift/ABI/MetadataValues.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -1926,7 +1926,8 @@ class JobFlags : public FlagSet<size_t> {
19261926
// Kind-specific flags.
19271927

19281928
Task_IsChildTask = 24,
1929-
Task_IsFuture = 25
1929+
Task_IsFuture = 25,
1930+
Task_IsTaskGroup = 26,
19301931
};
19311932

19321933
explicit JobFlags(size_t bits) : FlagSet(bits) {}
@@ -1954,6 +1955,10 @@ class JobFlags : public FlagSet<size_t> {
19541955
task_isFuture,
19551956
task_setIsFuture)
19561957

1958+
FLAGSET_DEFINE_FLAG_ACCESSORS(Task_IsTaskGroup,
1959+
task_isTaskGroup,
1960+
task_setIsTaskGroup)
1961+
19571962
};
19581963

19591964
/// Kinds of task status record.

0 commit comments

Comments
 (0)