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] Move SerialID to IDC, get extensions working.

Browse Source
This commit is contained in:
Graydon Hoare
2017-11-01 17:26:53 -07:00
parent f13718ef63
commit ed0b43cbce
12 changed files with 165 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Serialization/ModuleFile.cpp
View File

@@ -1787,13 +1787,10 @@ void ModuleFile::loadObjCMethods(
}
Optional<TinyPtrVector<ValueDecl *>>
ModuleFile::loadNamedMembers(const Decl *D, DeclName N,
ModuleFile::loadNamedMembers(const IterableDeclContext *IDC, DeclName N,
uint64_t contextData) {
auto VD = dyn_cast<ValueDecl>(D);
if (!VD)
return None;
assert(VD->wasDeserialized());
assert(IDC->wasDeserialized());
if (!DeclMemberNames)
return None;
@@ -1823,9 +1820,9 @@ ModuleFile::loadNamedMembers(const Decl *D, DeclName N,
}
assert(subTable);
auto j = subTable->find(VD->getDeclID());
TinyPtrVector<ValueDecl *> results;
auto j = subTable->find(IDC->getDeclID());
if (j != subTable->end()) {
TinyPtrVector<ValueDecl *> results;
for (DeclID d : *j) {
Expected<Decl *> mem = getDeclChecked(d);
if (mem) {
@@ -1841,9 +1838,8 @@ ModuleFile::loadNamedMembers(const Decl *D, DeclName N,
return None;
}
}
return results;
}
return None;
return results;
}
void ModuleFile::lookupClassMember(ModuleDecl::AccessPathTy accessPath,