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

Serialize the list of inherited types for all nominal types.

Browse Source 
This provides better AST fidelity through module files and further
reduces our dependencies on storing a list of protocols on nominal
type declarations.

Swift SVN r31345
This commit is contained in:
Doug Gregor
2015-08-19 21:10:45 +00:00
parent dd68b9fc59
commit 83cb1e69bb
6 changed files with 134 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/Serialization/Serialization.cpp
View File

@@ -2147,9 +2147,12 @@ void Serializer::writeDecl(const Decl *D) {
auto contextID = addDeclContextRef(theStruct->getDeclContext());
SmallVector<DeclID, 8> protocols;
SmallVector<DeclID, 8> protocolsAndInherited;
for (auto proto : theStruct->getLocalProtocols())
protocols.push_back(addDeclRef(proto));
protocolsAndInherited.push_back(addDeclRef(proto));
unsigned numProtocols = protocolsAndInherited.size();
for (auto inherited : theStruct->getInherited())
protocolsAndInherited.push_back(addTypeRef(inherited.getType()));
uint8_t rawAccessLevel =
getRawStableAccessibility(theStruct->getFormalAccess());
@@ -2160,7 +2163,8 @@ void Serializer::writeDecl(const Decl *D) {
contextID,
theStruct->isImplicit(),
rawAccessLevel,
protocols);
numProtocols,
protocolsAndInherited);
writeGenericParams(theStruct->getGenericParams(), DeclTypeAbbrCodes);
@@ -2179,9 +2183,12 @@ void Serializer::writeDecl(const Decl *D) {
auto contextID = addDeclContextRef(theEnum->getDeclContext());
SmallVector<DeclID, 8> protocols;
SmallVector<DeclID, 8> protocolsAndInherited;
for (auto proto : theEnum->getLocalProtocols())
protocols.push_back(addDeclRef(proto));
protocolsAndInherited.push_back(addDeclRef(proto));
unsigned numProtocols = protocolsAndInherited.size();
for (auto inherited : theEnum->getInherited())
protocolsAndInherited.push_back(addTypeRef(inherited.getType()));
uint8_t rawAccessLevel =
getRawStableAccessibility(theEnum->getFormalAccess());
@@ -2193,7 +2200,8 @@ void Serializer::writeDecl(const Decl *D) {
theEnum->isImplicit(),
addTypeRef(theEnum->getRawType()),
rawAccessLevel,
protocols);
numProtocols,
protocolsAndInherited);
writeGenericParams(theEnum->getGenericParams(), DeclTypeAbbrCodes);
writeRequirements(theEnum->getGenericRequirements());
@@ -2211,9 +2219,12 @@ void Serializer::writeDecl(const Decl *D) {
auto contextID = addDeclContextRef(theClass->getDeclContext());
SmallVector<DeclID, 8> protocols;
SmallVector<DeclID, 8> protocolsAndInherited;
for (auto proto : theClass->getLocalProtocols())
protocols.push_back(addDeclRef(proto));
protocolsAndInherited.push_back(addDeclRef(proto));
unsigned numProtocols = protocolsAndInherited.size();
for (auto inherited : theClass->getInherited())
protocolsAndInherited.push_back(addTypeRef(inherited.getType()));
uint8_t rawAccessLevel =
getRawStableAccessibility(theClass->getFormalAccess());
@@ -2228,7 +2239,8 @@ void Serializer::writeDecl(const Decl *D) {
theClass->isForeign(),
addTypeRef(theClass->getSuperclass()),
rawAccessLevel,
protocols);
numProtocols,
protocolsAndInherited);
writeGenericParams(theClass->getGenericParams(), DeclTypeAbbrCodes);
writeRequirements(theClass->getGenericRequirements());
@@ -2247,9 +2259,12 @@ void Serializer::writeDecl(const Decl *D) {
auto contextID = addDeclContextRef(proto->getDeclContext());
SmallVector<DeclID, 8> protocols;
SmallVector<DeclID, 8> protocolsAndInherited;
for (auto proto : proto->getInheritedProtocols(nullptr))
protocols.push_back(addDeclRef(proto));
protocolsAndInherited.push_back(addDeclRef(proto));
unsigned numProtocols = protocolsAndInherited.size();
for (auto inherited : proto->getInherited())
protocolsAndInherited.push_back(addTypeRef(inherited.getType()));
uint8_t rawAccessLevel =
getRawStableAccessibility(proto->getFormalAccess());
@@ -2263,7 +2278,8 @@ void Serializer::writeDecl(const Decl *D) {
->requiresClass(),
proto->isObjC(),
rawAccessLevel,
protocols);
numProtocols,
protocolsAndInherited);
writeGenericParams(proto->getGenericParams(), DeclTypeAbbrCodes);
writeRequirements(proto->getGenericRequirements());