For ModuleLoader::makeModuleVisible() also pass the source location where the
module import occurred.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174191 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Frontend/ASTUnit.h b/include/clang/Frontend/ASTUnit.h
index 3701cdc..9a02c0c 100644
--- a/include/clang/Frontend/ASTUnit.h
+++ b/include/clang/Frontend/ASTUnit.h
@@ -839,7 +839,8 @@
}
virtual void makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind Visibility) { }
+ Module::NameVisibilityKind Visibility,
+ SourceLocation ImportLoc) { }
};
diff --git a/include/clang/Frontend/CompilerInstance.h b/include/clang/Frontend/CompilerInstance.h
index a17e1c8..273fcc1 100644
--- a/include/clang/Frontend/CompilerInstance.h
+++ b/include/clang/Frontend/CompilerInstance.h
@@ -662,7 +662,8 @@
bool IsInclusionDirective);
virtual void makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind Visibility);
+ Module::NameVisibilityKind Visibility,
+ SourceLocation ImportLoc);
};
diff --git a/include/clang/Lex/ModuleLoader.h b/include/clang/Lex/ModuleLoader.h
index 933cfd3..93e69a6 100644
--- a/include/clang/Lex/ModuleLoader.h
+++ b/include/clang/Lex/ModuleLoader.h
@@ -82,7 +82,8 @@
/// \brief Make the given module visible.
virtual void makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind Visibility) = 0;
+ Module::NameVisibilityKind Visibility,
+ SourceLocation ImportLoc) = 0;
};
}
diff --git a/include/clang/Serialization/ASTReader.h b/include/clang/Serialization/ASTReader.h
index d3f3466..bfa3994 100644
--- a/include/clang/Serialization/ASTReader.h
+++ b/include/clang/Serialization/ASTReader.h
@@ -1164,7 +1164,8 @@
/// \param NameVisibility The level of visibility to give the names in the
/// module. Visibility can only be increased over time.
void makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind NameVisibility);
+ Module::NameVisibilityKind NameVisibility,
+ SourceLocation ImportLoc);
/// \brief Make the names within this set of hidden names visible.
void makeNamesVisible(const HiddenNames &Names);
diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index 27f96b0..d4a3513 100644
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -890,7 +890,8 @@
if (!ImportLoc.isInvalid() && LastModuleImportLoc == ImportLoc) {
// Make the named module visible.
if (LastModuleImportResult)
- ModuleManager->makeModuleVisible(LastModuleImportResult, Visibility);
+ ModuleManager->makeModuleVisible(LastModuleImportResult, Visibility,
+ ImportLoc);
return LastModuleImportResult;
}
@@ -1178,7 +1179,7 @@
return ModuleLoadResult();
}
- ModuleManager->makeModuleVisible(Module, Visibility);
+ ModuleManager->makeModuleVisible(Module, Visibility, ImportLoc);
}
// If this module import was due to an inclusion directive, create an
@@ -1199,7 +1200,8 @@
}
void CompilerInstance::makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind Visibility){
- ModuleManager->makeModuleVisible(Mod, Visibility);
+ Module::NameVisibilityKind Visibility,
+ SourceLocation ImportLoc){
+ ModuleManager->makeModuleVisible(Mod, Visibility, ImportLoc);
}
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 0d549fc..45f7cae 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -11514,7 +11514,7 @@
Consumer.HandleImplicitImportDecl(ImportD);
// Make the module visible.
- PP.getModuleLoader().makeModuleVisible(Mod, Module::AllVisible);
+ PP.getModuleLoader().makeModuleVisible(Mod, Module::AllVisible, Loc);
}
void Sema::ActOnPragmaRedefineExtname(IdentifierInfo* Name,
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 1524da9..37db83e 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -2591,7 +2591,8 @@
}
void ASTReader::makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind NameVisibility) {
+ Module::NameVisibilityKind NameVisibility,
+ SourceLocation ImportLoc) {
llvm::SmallPtrSet<Module *, 4> Visited;
SmallVector<Module *, 4> Stack;
Stack.push_back(Mod);
@@ -3082,7 +3083,8 @@
// Re-export any modules that were imported by a non-module AST file.
for (unsigned I = 0, N = ImportedModules.size(); I != N; ++I) {
if (Module *Imported = getSubmodule(ImportedModules[I]))
- makeModuleVisible(Imported, Module::AllVisible);
+ makeModuleVisible(Imported, Module::AllVisible,
+ /*ImportLoc=*/SourceLocation());
}
ImportedModules.clear();
}
diff --git a/unittests/Basic/SourceManagerTest.cpp b/unittests/Basic/SourceManagerTest.cpp
index 443d077..a7beb8f 100644
--- a/unittests/Basic/SourceManagerTest.cpp
+++ b/unittests/Basic/SourceManagerTest.cpp
@@ -60,7 +60,8 @@
}
virtual void makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind Visibility) { }
+ Module::NameVisibilityKind Visibility,
+ SourceLocation ImportLoc) { }
};
TEST_F(SourceManagerTest, isBeforeInTranslationUnit) {
diff --git a/unittests/Lex/LexerTest.cpp b/unittests/Lex/LexerTest.cpp
index a7c6284..505be75 100644
--- a/unittests/Lex/LexerTest.cpp
+++ b/unittests/Lex/LexerTest.cpp
@@ -61,7 +61,8 @@
}
virtual void makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind Visibility) { }
+ Module::NameVisibilityKind Visibility,
+ SourceLocation ImportLoc) { }
};
TEST_F(LexerTest, LexAPI) {
diff --git a/unittests/Lex/PPCallbacksTest.cpp b/unittests/Lex/PPCallbacksTest.cpp
index 073e07c..13104cb 100644
--- a/unittests/Lex/PPCallbacksTest.cpp
+++ b/unittests/Lex/PPCallbacksTest.cpp
@@ -38,7 +38,8 @@
}
virtual void makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind Visibility) { }
+ Module::NameVisibilityKind Visibility,
+ SourceLocation ImportLoc) { }
};
// Stub to collect data from InclusionDirective callbacks.
diff --git a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp
index 80c352d..856a8ff 100644
--- a/unittests/Lex/PPConditionalDirectiveRecordTest.cpp
+++ b/unittests/Lex/PPConditionalDirectiveRecordTest.cpp
@@ -61,7 +61,8 @@
}
virtual void makeModuleVisible(Module *Mod,
- Module::NameVisibilityKind Visibility) { }
+ Module::NameVisibilityKind Visibility,
+ SourceLocation ImportLoc) { }
};
TEST_F(PPConditionalDirectiveRecordTest, PPRecAPI) {