New shadowing rule, part 2 #26864
New shadowing rule, part 2 #26864
Conversation
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
| DeclName name, SmallVectorImpl<ValueDecl *> &decls, | ||
| NLKind lookupKind, ResolutionKind resolutionKind, | ||
| const DeclContext *moduleScopeContext, | ||
| ArrayRef<ModuleDecl::ImportedModule> extraImports = {}); | ||
| const DeclContext *moduleScopeContext); |
There was a problem hiding this comment.
Is moduleScopeContext ever different from moduleOrFile? Is the top level access path ever non-empty? Seems like there's still a simpler public interface here.
There was a problem hiding this comment.
Yes, moduleScopeContext can be different. Eg when we do a qualified lookup into a module, we do sourceFile->lookupQualified(mod, ...) which passes sourceFile as moduleScopeContext, but mod as moduleOrFile.
As for the access path, it's used in one place to find a declaration but we use the declaration's name as the access path. I believe that's equivalent to having no access path.
There was a problem hiding this comment.
Oh, whoops, of course. I forgot this is for qualified lookup too, not just unqualified lookup. The access path thing does seem equivalent though.
There was a problem hiding this comment.
Another fun parameter here is lookupKind, which appears to be only used to implement the "hide weird Carbon symbols from Darwin module" thing.
There was a problem hiding this comment.
Also Builtin, but yeah.
This simulates the shadowing done by ModuleNameLookup, which is about to be removed. The basic idea is that top-level declarations found via scoped imports take precedence over unscoped imports.
…e and extra imports Also get rid of the 'accessPath' parameter.
slavapestov
force-pushed
the
new-shadowing-rule-part-2
branch
from
3d2d40b to
37f308b
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
Builds on #26791 by adding more shadowing rules to removeShadowedDecls() with the goal of eventually supplanting the shadowing done in ModuleNameLookup.