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

Merge remote-tracking branch 'origin/master' into master-next

Browse Source
This commit is contained in:
swift_jenkins
2020-04-24 12:58:09 -07:00
parent 4dd689abd0 b4c7a7e85d
commit 71686f9984
90 changed files with 457 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/ModuleFile.cpp
View File

@@ -2148,7 +2148,7 @@ void ModuleFile::lookupValue(DeclName name,
continue;
}
auto VD = cast<ValueDecl>(declOrError.get());
if (name.isSimpleName() || VD->getFullName().matchesRef(name))
if (name.isSimpleName() || VD->getName().matchesRef(name))
results.push_back(VD);
}
}
@@ -2591,7 +2591,7 @@ void ModuleFile::lookupClassMember(ModuleDecl::AccessPathTy accessPath,
} else {
for (auto item : *iter) {
auto vd = cast<ValueDecl>(getDecl(item.second));
if (!vd->getFullName().matchesRef(name))
if (!vd->getName().matchesRef(name))
continue;
auto dc = vd->getDeclContext();