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

[serialization] Include generic protocol witness substitutions.

Browse Source 
This finishes up Joe's changes in r6397.

Swift SVN r6558
This commit is contained in:
Jordan Rose
2013-07-24 21:15:42 +00:00
parent cf2f43b710
commit d11585f810
6 changed files with 230 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Serialization/Serialization.cpp
View File

@@ -187,6 +187,9 @@ namespace {
/// Writes a generic parameter list.
bool writeGenericParams(const GenericParamList *genericParams);
/// Writes a list of generic substitutions.
void writeSubstitutions(ArrayRef<Substitution> substitutions);
/// Writes a list of protocol conformances.
void writeConformances(ArrayRef<ProtocolDecl *> protocols,
ArrayRef<ProtocolConformance *> conformances);
@@ -714,9 +717,10 @@ Serializer::writeConformances(ArrayRef<ProtocolDecl *> protocols,
SmallVector<DeclID, 16> data;
for (auto valueMapping : conf->Mapping) {
// FIXME: Serialize witness substitutions.
data.push_back(addDeclRef(valueMapping.first));
data.push_back(addDeclRef(valueMapping.second.Decl));
// The substitution records are serialized later.
data.push_back(valueMapping.second.Substitutions.size());
}
for (auto typeMapping : conf->TypeMapping) {
data.push_back(addTypeRef(typeMapping.first));
@@ -743,9 +747,22 @@ Serializer::writeConformances(ArrayRef<ProtocolDecl *> protocols,
inheritedConformance.push_back(inheritedMapping.second);
}
writeConformances(inheritedProtos, inheritedConformance);
for (auto valueMapping : conf->Mapping)
writeSubstitutions(valueMapping.second.Substitutions);
});
}
void Serializer::writeSubstitutions(ArrayRef<Substitution> substitutions) {
using namespace decls_block;
auto abbrCode = DeclTypeAbbrCodes[BoundGenericSubstitutionLayout::Code];
for (auto &sub : substitutions) {
BoundGenericSubstitutionLayout::emitRecord(Out, ScratchRecord, abbrCode,
addTypeRef(sub.Archetype),
addTypeRef(sub.Replacement));
writeConformances(sub.Archetype->getConformsTo(), sub.Conformance);
}
}
void Serializer::writeMembers(ArrayRef<Decl*> members) {
using namespace decls_block;
@@ -1521,15 +1538,8 @@ bool Serializer::writeType(Type ty) {
addTypeRef(generic->getParent()),
genericArgIDs);
if (generic->hasSubstitutions()) {
abbrCode = DeclTypeAbbrCodes[BoundGenericSubstitutionLayout::Code];
for (auto &sub : generic->getSubstitutions()) {
BoundGenericSubstitutionLayout::emitRecord(Out, ScratchRecord, abbrCode,
addTypeRef(sub.Archetype),
addTypeRef(sub.Replacement));
writeConformances(sub.Archetype->getConformsTo(), sub.Conformance);
}
}
if (generic->hasSubstitutions())
writeSubstitutions(generic->getSubstitutions());
return true;
}