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

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

Browse Source 
Conflicts:
	lib/IRGen/IRGenDebugInfo.cpp
This commit is contained in:
Adrian Prantl
2021-01-29 16:17:10 -08:00
parent dbfc4dc329 3b77ce4e19
commit a9f05c8c30
72 changed files with 1396 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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 = 591; // @concurrent function type
const uint16_t SWIFTMODULE_VERSION_MINOR = 592; // @concurrent SIL function type
/// A standard hash seed used for all string hashes in a serialized module.
///
@@ -1071,6 +1071,7 @@ namespace decls_block {
using SILFunctionTypeLayout = BCRecordLayout<
SIL_FUNCTION_TYPE,
BCFixed<1>, // concurrent?
BCFixed<1>, // async?
SILCoroutineKindField, // coroutine kind
ParameterConventionField, // callee convention