averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2021-01-29 18:12:24 -08:00
parent 730af40841 edd0c47e18
commit 4cce308fc6
7 changed files with 110 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Serialization/ModuleFormat.h
View File

@@ -56,7 +56,7 @@ const uint16_t SWIFTMODULE_VERSION_MAJOR = 0;
/// describe what change you made. The content of this comment isn't important;
/// it just ensures a conflict if two people change the module format.
/// Don't worry about adhering to the 80-column limit for this line.
const uint16_t SWIFTMODULE_VERSION_MINOR = 592; // @concurrent SIL function type
const uint16_t SWIFTMODULE_VERSION_MINOR = 593; // foreign async convention
/// A standard hash seed used for all string hashes in a serialized module.
///
@@ -1767,6 +1767,13 @@ namespace decls_block {
TypeIDField // result type
>;
using ForeignAsyncConventionLayout = BCRecordLayout<
FOREIGN_ASYNC_CONVENTION,
TypeIDField, // completion handler type
BCVBR<4>, // completion handler parameter index
BCVBR<4> // completion handler error parameter index (+1)
>;
using AbstractClosureExprLayout = BCRecordLayout<
ABSTRACT_CLOSURE_EXPR_CONTEXT,
TypeIDField, // type