Skip to content

Commit 9eb0a1f

Browse files
committed
Merge branch 'add_template_tests' into class_templates
2 parents 1ca883b + e978d22 commit 9eb0a1f

File tree

109 files changed

+2305
-828
lines changed

Some content is hidden

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

109 files changed

+2305
-828
lines changed

include/swift/ABI/MetadataValues.h

+3
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,9 @@ namespace SpecialPointerAuthDiscriminators {
11771177

11781178
/// Resilient class stub initializer callback
11791179
const uint16_t ResilientClassStubInitCallback = 0xC671;
1180+
1181+
/// Actor enqueue(partialTask:).
1182+
const uint16_t ActorEnqueuePartialTask = 0x8f3d;
11801183
}
11811184

11821185
/// The number of arguments that will be passed directly to a generic

include/swift/AST/Attr.def

+1-1
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ SIMPLE_DECL_ATTR(asyncHandler, AsyncHandler,
567567
101)
568568

569569
CONTEXTUAL_SIMPLE_DECL_ATTR(actor, Actor,
570-
OnClass | ConcurrencyOnly |
570+
DeclModifier | OnClass | ConcurrencyOnly |
571571
ABIBreakingToAdd | ABIBreakingToRemove |
572572
APIBreakingToAdd | APIBreakingToRemove,
573573
102)

0 commit comments

Comments
 (0)