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] Tighten up handling of generic param lists.

Browse Source 
No functionality change. Does not fix the issue with extensions of generic
types.

Swift SVN r18828
This commit is contained in:
Jordan Rose
2014-06-12 19:45:05 +00:00
parent afafa9d24e
commit e5c6de2224
2 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Serialization/Serialization.cpp
View File

@@ -146,22 +146,10 @@ DeclID Serializer::addDeclRef(const Decl *D, bool forceSerialization) {
// Record any generic parameters that come from this decl, so that we can use
// the decl to refer to the parameters later.
const GenericParamList *paramList = nullptr;
switch (D->getKind()) {
case DeclKind::Constructor:
paramList = cast<ConstructorDecl>(D)->getGenericParams();
break;
case DeclKind::Func:
paramList = cast<FuncDecl>(D)->getGenericParams();
break;
case DeclKind::Class:
case DeclKind::Struct:
case DeclKind::Enum:
case DeclKind::Protocol:
paramList = cast<NominalTypeDecl>(D)->getGenericParams();
break;
default:
break;
}
if (auto fn = dyn_cast<AbstractFunctionDecl>(D))
paramList = fn->getGenericParams();
else if (auto nominal = dyn_cast<NominalTypeDecl>(D))
paramList = nominal->getGenericParams();
if (paramList)
GenericContexts[paramList] = D;
@@ -1368,6 +1356,10 @@ void Serializer::writeDecl(const Decl *D) {
const Decl *DC = getDeclForContext(extension->getDeclContext());
Type baseTy = extension->getExtendedType();
// Make sure the base type has registered itself as a provider of generic
// parameters.
(void)addDeclRef(baseTy->getAnyNominal());
SmallVector<DeclID, 8> protocols;
for (auto proto : extension->getProtocols())
protocols.push_back(addDeclRef(proto));