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

Add missing access path filters for DerivedFileUnit.

Browse Source 
I can't see this ever actually being an issue, but if someone performs a
scoped import on another module, and that module synthesizes a derived
declaration, further lookups shouldn't find that declaration if the name
doesn't match the import scope.

Swift SVN r14487
This commit is contained in:
Jordan Rose
2014-02-27 23:46:05 +00:00
parent e02c02b403
commit 7ac2c1de2f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/AST/Module.cpp
View File

@@ -317,6 +317,13 @@ void DerivedFileUnit::lookupValue(Module::AccessPathTy accessPath,
Identifier name,
NLKind lookupKind,
SmallVectorImpl<ValueDecl*> &result) const {
assert(accessPath.size() <= 1 && "can only refer to top-level decls");
// If this import is specific to some named type or decl ("import Swift.int")
// then filter out any lookups that don't match.
if (accessPath.size() == 1 && accessPath.front().first != Name)
return;
if (name == DerivedDecl->getName())
result.push_back(DerivedDecl);
}
@@ -324,6 +331,14 @@ void DerivedFileUnit::lookupValue(Module::AccessPathTy accessPath,
void DerivedFileUnit::lookupVisibleDecls(Module::AccessPathTy accessPath,
VisibleDeclConsumer &consumer,
NLKind lookupKind) const {
assert(accessPath.size() <= 1 && "can only refer to top-level decls");
// If this import is specific to some named type or decl ("import Swift.int")
// then filter out any lookups that don't match.
if (accessPath.size() == 1 &&
accessPath.front().first != DerivedDecl->getName())
return;
consumer.foundDecl(DerivedDecl, DeclVisibilityKind::VisibleAtTopLevel);
}