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

36
lib/Serialization/Deserialization.cpp
View File

@@ -3647,24 +3647,6 @@ Type ModuleFile::getType(TypeID TID) {
decls_block::ArchetypeNestedTypeNamesLayout::readRecord(scratch,
rawNameIDs);
// Read whether the associated types are dependent archetypes.
entry = DeclTypeCursor.advance();
if (entry.Kind != llvm::BitstreamEntry::Record) {
error();
break;
}
SmallVector<uint64_t, 16> scratch2;
kind = DeclTypeCursor.readRecord(entry.ID, scratch2);
if (kind != decls_block::ARCHETYPE_NESTED_TYPES_ARE_ARCHETYPES) {
error();
break;
}
ArrayRef<uint64_t> areArchetypes;
decls_block::ArchetypeNestedTypesAreArchetypesLayout
::readRecord(scratch2, areArchetypes);
// Read the associated type ids.
entry = DeclTypeCursor.advance();
if (entry.Kind != llvm::BitstreamEntry::Record) {
@@ -3672,26 +3654,22 @@ Type ModuleFile::getType(TypeID TID) {
break;
}
SmallVector<uint64_t, 16> scratch3;
kind = DeclTypeCursor.readRecord(entry.ID, scratch3);
SmallVector<uint64_t, 16> scratch2;
kind = DeclTypeCursor.readRecord(entry.ID, scratch2);
if (kind != decls_block::ARCHETYPE_NESTED_TYPES) {
error();
break;
}
ArrayRef<uint64_t> rawTypeIDs;
decls_block::ArchetypeNestedTypesLayout::readRecord(scratch3, rawTypeIDs);
decls_block::ArchetypeNestedTypesLayout::readRecord(scratch2, rawTypeIDs);
// Build the nested types array.
SmallVector<std::pair<Identifier, ArchetypeType::NestedType>, 4>
nestedTypes;
for_each3(rawNameIDs, areArchetypes, rawTypeIDs,
[&](IdentifierID nameID, bool isArchetype, TypeID nestedID) {
SmallVector<std::pair<Identifier, Type>, 4> nestedTypes;
for_each(rawNameIDs, rawTypeIDs,
[&](IdentifierID nameID, TypeID nestedID) {
Type type = getType(nestedID);
auto nestedTy = (isArchetype
? ArchetypeType::NestedType::forArchetype(type->castTo<ArchetypeType>())
: ArchetypeType::NestedType::forConcreteType(type));
nestedTypes.push_back(std::make_pair(getIdentifier(nameID), nestedTy));
nestedTypes.push_back(std::make_pair(getIdentifier(nameID), type));
});
archetype->setNestedTypes(ctx, nestedTypes);