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

[NamedLazyMemberLoading] Rename CLASS_MEMBERS{,_FOR_DYNAMIC_LOOKUP} for clarity

Browse Source
This commit is contained in:
Graydon Hoare
2017-10-27 12:24:59 -07:00
parent 65fc0f492a
commit 7ba241dada
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Serialization/ModuleFile.cpp
View File

@@ -667,8 +667,8 @@ bool ModuleFile::readIndexBlock(llvm::BitstreamCursor &cursor) {
case index_block::EXTENSIONS:
ExtensionDecls = readExtensionTable(scratch, blobData);
break;
case index_block::CLASS_MEMBERS:
ClassMembersByName = readDeclTable(scratch, blobData);
case index_block::CLASS_MEMBERS_FOR_DYNAMIC_LOOKUP:
ClassMembersForDynamicLookup = readDeclTable(scratch, blobData);
break;
case index_block::OPERATOR_METHODS:
OperatorMethodDecls = readDeclTable(scratch, blobData);
@@ -1640,11 +1640,11 @@ void ModuleFile::lookupClassMember(ModuleDecl::AccessPathTy accessPath,
PrettyStackTraceModuleFile stackEntry(*this);
assert(accessPath.size() <= 1 && "can only refer to top-level decls");
if (!ClassMembersByName)
if (!ClassMembersForDynamicLookup)
return;
auto iter = ClassMembersByName->find(name.getBaseName());
if (iter == ClassMembersByName->end())
auto iter = ClassMembersForDynamicLookup->find(name.getBaseName());
if (iter == ClassMembersForDynamicLookup->end())
return;
if (!accessPath.empty()) {
@@ -1689,11 +1689,11 @@ void ModuleFile::lookupClassMembers(ModuleDecl::AccessPathTy accessPath,
PrettyStackTraceModuleFile stackEntry(*this);
assert(accessPath.size() <= 1 && "can only refer to top-level decls");
if (!ClassMembersByName)
if (!ClassMembersForDynamicLookup)
return;
if (!accessPath.empty()) {
for (const auto &list : ClassMembersByName->data()) {
for (const auto &list : ClassMembersForDynamicLookup->data()) {
for (auto item : list) {
auto vd = cast<ValueDecl>(getDecl(item.second));
auto dc = vd->getDeclContext();
@@ -1707,7 +1707,7 @@ void ModuleFile::lookupClassMembers(ModuleDecl::AccessPathTy accessPath,
return;
}
for (const auto &list : ClassMembersByName->data()) {
for (const auto &list : ClassMembersForDynamicLookup->data()) {
for (auto item : list)
consumer.foundDecl(cast<ValueDecl>(getDecl(item.second)),
DeclVisibilityKind::DynamicLookup);