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] Add support for substituted types and nested archetypes.

Browse Source 
This also allows us to check same-type requirements.

Swift SVN r5986
This commit is contained in:
Jordan Rose
2013-07-04 00:20:26 +00:00
parent 5394643d09
commit bcab0b4fbe
3 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lib/Serialization/ModuleFile.cpp
View File

@@ -220,6 +220,7 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC) {
uint8_t rawKind;
ArrayRef<uint64_t> rawTypeIDs;
GenericRequirementLayout::readRecord(scratch, rawKind, rawTypeIDs);
switch (rawKind) {
case GenericRequirementKind::Conformance: {
assert(rawTypeIDs.size() == 2);
@@ -254,6 +255,8 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC) {
// an error so that we don't actually try to generate code.
error();
}
break;
}
default:
// This record is not part of the GenericParamList.
@@ -1044,20 +1047,57 @@ Type ModuleFile::getType(TypeID TID) {
rawConformanceIDs);
ArchetypeType *parent = nullptr;
Type superclass;
Optional<unsigned> index;
if (isPrimary)
index = parentOrIndex;
else
parent = getType(parentOrIndex)->castTo<ArchetypeType>();
SmallVector<ProtocolDecl *, 4> conformances;
for (DeclID protoID : rawConformanceIDs)
conformances.push_back(cast<ProtocolDecl>(getDecl(protoID)));
{
BCOffsetRAII restoreOffset(DeclTypeCursor);
if (isPrimary)
index = parentOrIndex;
else
parent = getType(parentOrIndex)->castTo<ArchetypeType>();
superclass = getType(superclassID);
for (DeclID protoID : rawConformanceIDs)
conformances.push_back(cast<ProtocolDecl>(getDecl(protoID)));
}
auto archetype = ArchetypeType::getNew(ctx, parent, getIdentifier(nameID),
conformances, getType(superclassID),
index);
conformances, superclass, index);
typeOrOffset = archetype;
auto entry = DeclTypeCursor.advance();
if (entry.Kind != llvm::BitstreamEntry::Record) {
error();
break;
}
scratch.clear();
unsigned kind = DeclTypeCursor.readRecord(entry.ID, scratch);
if (kind != decls_block::ARCHETYPE_NESTED_TYPES) {
error();
break;
}
ArrayRef<uint64_t> rawTypeIDs;
decls_block::ArchetypeNestedTypesLayout::readRecord(scratch, rawTypeIDs);
SmallVector<std::pair<Identifier, ArchetypeType *>, 4> nestedTypes;
for (TypeID nestedID : rawTypeIDs) {
if (nestedID == TID) {
nestedTypes.push_back(std::make_pair(ctx.getIdentifier("This"),
archetype));
} else {
auto nested = getType(nestedID)->castTo<ArchetypeType>();
nestedTypes.push_back(std::make_pair(nested->getName(),
nested));
}
}
archetype->setNestedTypes(ctx, nestedTypes);
break;
}
@@ -1075,6 +1115,17 @@ Type ModuleFile::getType(TypeID TID) {
break;
}
case decls_block::SUBSTITUTED_TYPE: {
TypeID originalID, replacementID;
decls_block::SubstitutedTypeLayout::readRecord(scratch, originalID,
replacementID);
typeOrOffset = SubstitutedType::get(getType(originalID),
getType(replacementID),
ctx);
break;
}
default:
// We don't know how to deserialize this kind of type.
error();