Introduce the notion of name visibility into modules. For a given
(sub)module, all of the names may be hidden, just the macro names may
be exposed (for example, after the preprocessor has seen the import of
the module but the parser has not), or all of the names may be
exposed. Importing a module makes its names, and the names in any of
its non-explicit submodules, visible to name lookup (transitively).
This commit only introduces the notion of name visible and marks
modules and submodules as visible when they are imported. The actual
name-hiding logic in the AST reader will follow (along with test cases).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@145586 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index 743a447..746c00a 100644
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -1069,12 +1069,17 @@
}
Module *CompilerInstance::loadModule(SourceLocation ImportLoc,
- ModuleIdPath Path) {
+ ModuleIdPath Path,
+ Module::NameVisibilityKind Visibility) {
// If we've already handled this import, just return the cached result.
// This one-element cache is important to eliminate redundant diagnostics
// when both the preprocessor and parser see the same import declaration.
- if (!ImportLoc.isInvalid() && LastModuleImportLoc == ImportLoc)
+ if (!ImportLoc.isInvalid() && LastModuleImportLoc == ImportLoc) {
+ // Make the named module visible.
+ if (LastModuleImportResult)
+ ModuleManager->makeModuleVisible(LastModuleImportResult, Visibility);
return LastModuleImportResult;
+ }
// Determine what file we're searching from.
SourceManager &SourceMgr = getSourceManager();
@@ -1253,7 +1258,9 @@
}
}
- // FIXME: Tell the AST reader to make the named submodule visible.
+ // Make the named module visible.
+ if (Module)
+ ModuleManager->makeModuleVisible(Module, Visibility);
LastModuleImportLoc = ImportLoc;
LastModuleImportResult = Module;