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] Force-serialize derived decls for local types too.

Browse Source 
Otherwise, when a file contains a local enum, the decl for its synthesized
== ends up disappearing, and we get a dangling XREF.

rdar://problem/20429123

Swift SVN r28131
This commit is contained in:
Jordan Rose
2015-05-04 21:57:00 +00:00
parent 2f1f9b53de
commit 3cf2915dd0
2 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Serialization/Serialization.cpp
View File

@@ -3464,7 +3464,8 @@ static void addOperatorsAndTopLevel(Serializer &S, Range members,
Serializer::DeclTable &operatorMethodDecls,
Serializer::DeclTable &topLevelDecls,
Serializer::ObjCMethodTable &objcMethods,
bool isDerivedTopLevel) {
bool isDerivedTopLevel,
bool isLocal = false) {
for (const Decl *member : members) {
auto memberValue = dyn_cast<ValueDecl>(member);
if (!memberValue)
@@ -3496,14 +3497,16 @@ static void addOperatorsAndTopLevel(Serializer &S, Range members,
}
// Record Objective-C methods.
if (auto func = dyn_cast<AbstractFunctionDecl>(member)) {
if (func->isObjC()) {
TypeID owningTypeID
= S.addTypeRef(func->getDeclContext()->getDeclaredInterfaceType());
objcMethods[func->getObjCSelector()].push_back(
std::make_tuple(owningTypeID,
func->isObjCInstanceMethod(),
S.addDeclRef(memberValue)));
if (!isLocal) {
if (auto func = dyn_cast<AbstractFunctionDecl>(member)) {
if (func->isObjC()) {
TypeID owningTypeID
= S.addTypeRef(func->getDeclContext()->getDeclaredInterfaceType());
objcMethods[func->getObjCSelector()].push_back(
std::make_tuple(owningTypeID,
func->isObjCInstanceMethod(),
S.addDeclRef(memberValue)));
}
}
}
}
@@ -3577,6 +3580,15 @@ void Serializer::writeAST(ModuleOrSourceFile DC) {
localTypeGenerator.insert(MangledName, {
addDeclRef(TD), TD->getLocalDiscriminator()
});
if (auto nominal = dyn_cast<NominalTypeDecl>(TD)) {
addOperatorsAndTopLevel(*this, nominal->getMembers(),
operatorMethodDecls, topLevelDecls,
objcMethods, false, /*isLocal=*/true);
addOperatorsAndTopLevel(*this, nominal->getDerivedGlobalDecls(),
operatorMethodDecls, topLevelDecls,
objcMethods, true, /*isLocal=*/true);
}
}
}