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

[Serialization] Give generic environments identitity.

Browse Source 
Serialize generic environments via a generic environment ID with a
separte offset table, so we have identity for the generic environments
and will share generic environments on deserialization.
This commit is contained in:
Doug Gregor
2016-12-13 16:55:21 -08:00
parent 2ff90611a8
commit 821965dee4
9 changed files with 427 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
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 = 299; // Last change: Added copy_unowned_value
const uint16_t VERSION_MINOR = 300; // Last change: Generic environment ID
using DeclID = PointerEmbeddedInt<unsigned, 31>;
using DeclIDField = BCFixed<31>;
@@ -78,6 +78,11 @@ using DeclContextIDField = DeclIDField;
using NormalConformanceID = DeclID;
using NormalConformanceIDField = DeclIDField;
// GenericEnvironmentID must be the same as DeclID because it is stored in the
// same way.
using GenericEnvironmentID = DeclID;
using GenericEnvironmentIDField = DeclIDField;
// ModuleID must be the same as IdentifierID because it is stored the same way.
using ModuleID = IdentifierID;
using ModuleIDField = IdentifierIDField;
@@ -751,6 +756,7 @@ namespace decls_block {
TypeIDField, // underlying type
TypeIDField, // interface type
BCFixed<1>, // implicit flag
GenericEnvironmentIDField, // generic environment
AccessibilityKindField // accessibility
// Trailed by generic parameters (if any).
>;
@@ -778,6 +784,7 @@ namespace decls_block {
IdentifierIDField, // name
DeclContextIDField, // context decl
BCFixed<1>, // implicit flag
GenericEnvironmentIDField, // generic environment
AccessibilityKindField, // accessibility
BCVBR<4>, // number of conformances
BCArray<TypeIDField> // inherited types
@@ -790,6 +797,7 @@ namespace decls_block {
IdentifierIDField, // name
DeclContextIDField, // context decl
BCFixed<1>, // implicit flag
GenericEnvironmentIDField, // generic environment
TypeIDField, // raw type
AccessibilityKindField, // accessibility
BCVBR<4>, // number of conformances
@@ -805,6 +813,7 @@ namespace decls_block {
BCFixed<1>, // implicit?
BCFixed<1>, // explicitly objc?
BCFixed<1>, // requires stored property initial values
GenericEnvironmentIDField, // generic environment
TypeIDField, // superclass
AccessibilityKindField, // accessibility
BCVBR<4>, // number of conformances
@@ -820,6 +829,7 @@ namespace decls_block {
BCFixed<1>, // implicit flag
BCFixed<1>, // class-bounded?
BCFixed<1>, // objc?
GenericEnvironmentIDField, // generic environment
AccessibilityKindField, // accessibility
BCVBR<4>, // number of protocols
BCArray<DeclIDField> // protocols and inherited types
@@ -843,6 +853,7 @@ namespace decls_block {
BCFixed<1>, // stub implementation?
BCFixed<1>, // throws?
CtorInitializerKindField, // initializer kind
GenericEnvironmentIDField, // generic environment
TypeIDField, // type (interface)
DeclIDField, // overridden decl
AccessibilityKindField, // accessibility
@@ -894,6 +905,7 @@ namespace decls_block {
BCFixed<1>, // has dynamic self?
BCFixed<1>, // throws?
BCVBR<5>, // number of parameter patterns
GenericEnvironmentIDField, // generic environment
TypeIDField, // interface type
DeclIDField, // operator decl
DeclIDField, // overridden function
@@ -984,6 +996,7 @@ namespace decls_block {
TypeIDField, // base type
DeclContextIDField, // context decl
BCFixed<1>, // implicit flag
GenericEnvironmentIDField, // generic environment
BCVBR<4>, // # of protocol conformances
BCArray<TypeIDField> // inherited types
// Trailed by the generic parameter lists, members record, and then
@@ -995,6 +1008,7 @@ namespace decls_block {
DeclContextIDField, // context decl
BCFixed<1>, // implicit?
BCFixed<1>, // objc?
GenericEnvironmentIDField, // generic environment
TypeIDField // interface type
// Trailed by a pattern for self.
>;
@@ -1071,15 +1085,13 @@ namespace decls_block {
using GenericEnvironmentLayout = BCRecordLayout<
GENERIC_ENVIRONMENT,
TypeIDField, // sugared interface type
TypeIDField // contextual type
BCArray<TypeIDField> // (sugared interface type, contextual type)
>;
using SILGenericEnvironmentLayout = BCRecordLayout<
SIL_GENERIC_ENVIRONMENT,
IdentifierIDField, // generic parameter name
TypeIDField, // canonical interface type
TypeIDField // contextual type
BCArray<TypeIDField> // (generic parameter name, sugared interface
// type, contextual type) triples
>;
using GenericRequirementLayout = BCRecordLayout<
@@ -1424,6 +1436,7 @@ namespace index_block {
LOCAL_DECL_CONTEXT_OFFSETS,
DECL_CONTEXT_OFFSETS,
LOCAL_TYPE_DECLS,
GENERIC_ENVIRONMENT_OFFSETS,
NORMAL_CONFORMANCE_OFFSETS,
SIL_LAYOUT_OFFSETS,