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/master' into master-next

Browse Source
This commit is contained in:
Bob Wilson
2017-01-12 15:58:19 -08:00
parent 221190f9dc 99080b4939
commit c765d5e3a5
297 changed files with 4847 additions and 1684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/swift/Serialization/ModuleFormat.h
View File

@@ -54,7 +54,7 @@ const uint16_t VERSION_MAJOR = 0;
/// in source control, you should also update the comment to briefly
/// 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.
const uint16_t VERSION_MINOR = 305; // Last change: linkage in SILVTable::Entry
const uint16_t VERSION_MINOR = 307; // Last change: layout requirements
using DeclID = PointerEmbeddedInt<unsigned, 31>;
using DeclIDField = BCFixed<31>;
@@ -199,7 +199,6 @@ enum class ParameterConvention : uint8_t {
Direct_Unowned,
Direct_Guaranteed,
Indirect_In_Guaranteed,
Direct_Deallocating,
};
using ParameterConventionField = BCFixed<4>;
@@ -249,6 +248,7 @@ enum GenericRequirementKind : uint8_t {
Conformance = 0,
SameType = 1,
Superclass = 2,
Layout = 3,
};
using GenericRequirementKindField = BCFixed<2>;