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

Merge pull request #12321 from DougGregor/assoc-type-overrides

Browse Source 
Track "overrides" of associated types
This commit is contained in:
Doug Gregor
2017-10-09 12:59:21 -07:00
committed by GitHub
parent 70dd88446c f51d5b6aec
commit d3de4f2321
19 changed files with 366 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Serialization/Serialization.cpp
View File

@@ -2720,6 +2720,10 @@ void Serializer::writeDecl(const Decl *D) {
verifyAttrSerializable(assocType);
auto contextID = addDeclContextRef(assocType->getDeclContext());
SmallVector<DeclID, 4> overriddenAssocTypeIDs;
for (auto overridden : assocType->getOverriddenDecls()) {
overriddenAssocTypeIDs.push_back(addDeclRef(overridden));
}
unsigned abbrCode = DeclTypeAbbrCodes[AssociatedTypeDeclLayout::Code];
AssociatedTypeDeclLayout::emitRecord(
@@ -2727,7 +2731,8 @@ void Serializer::writeDecl(const Decl *D) {
addDeclBaseNameRef(assocType->getName()),
contextID,
addTypeRef(assocType->getDefaultDefinitionType()),
assocType->isImplicit());
assocType->isImplicit(),
overriddenAssocTypeIDs);
break;
}