averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Serialization] Preserve private discriminators through serialization.

Browse Source 
Part of rdar://problem/17632175

Swift SVN r21611
This commit is contained in:
Jordan Rose
2014-08-30 17:27:02 +00:00
parent fcfd44c756
commit 1b51b60e72
8 changed files with 94 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Serialization/Serialization.cpp
View File

@@ -1448,6 +1448,26 @@ void Serializer::writeDecl(const Decl *D) {
writeDeclAttribute(Attr);
}
if (M->Ctx.LangOpts.UsePrivateDiscriminators) {
if (auto *value = dyn_cast<ValueDecl>(D)) {
if (value->hasAccessibility() &&
value->getAccessibility() == Accessibility::Private &&
!value->getDeclContext()->isLocalContext()) {
// FIXME: We shouldn't need to encode this for /all/ private decls.
// In theory we can follow the same rules as mangling and only include
// the outermost private context.
auto topLevelContext = value->getDeclContext()->getModuleScopeContext();
if (auto *enclosingFile = dyn_cast<FileUnit>(topLevelContext)) {
Identifier discriminator =
enclosingFile->getDiscriminatorForPrivateValue(value);
unsigned abbrCode = DeclTypeAbbrCodes[DiscriminatorLayout::Code];
DiscriminatorLayout::emitRecord(Out, ScratchRecord, abbrCode,
addIdentifierRef(discriminator));
}
}
}
}
switch (D->getKind()) {
case DeclKind::Import:
llvm_unreachable("import decls should not be serialized");
@@ -2622,6 +2642,8 @@ void Serializer::writeAllDeclsAndTypes() {
registerDeclTypeAbbr<NormalProtocolConformanceLayout>();
registerDeclTypeAbbr<SpecializedProtocolConformanceLayout>();
registerDeclTypeAbbr<InheritedProtocolConformanceLayout>();
registerDeclTypeAbbr<DiscriminatorLayout>();
registerDeclTypeAbbr<DeclContextLayout>();
registerDeclTypeAbbr<XRefLayout>();