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

[AST] Eliminate ArchetypeType::NestedType.

Browse Source 
Now that we no longer distinguish outer archetypes from inner
archetypes, we can replace NestedType with just Type.
This commit is contained in:
Doug Gregor
2016-12-07 10:04:53 -08:00
parent b34d8e340c
commit ea067c0346
16 changed files with 74 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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 = 289; // Last change: remove AssociatedTypeType
const uint16_t VERSION_MINOR = 290; // Last change: archetype nested types
using DeclID = PointerEmbeddedInt<unsigned, 31>;
using DeclIDField = BCFixed<31>;
@@ -646,11 +646,6 @@ namespace decls_block {
BCArray<TypeIDField>
>;
using ArchetypeNestedTypesAreArchetypesLayout = BCRecordLayout<
ARCHETYPE_NESTED_TYPES_ARE_ARCHETYPES,
BCArray<TypeIDField>
>;
using ProtocolCompositionTypeLayout = BCRecordLayout<
PROTOCOL_COMPOSITION_TYPE,
BCArray<TypeIDField> // protocols