From 5ebcb20b0331a6e64c213f0bb5f4bed9a9e8eb34 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Fri, 1 Feb 2013 16:36:12 +0000 Subject: 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 --- lib/Frontend/CompilerInstance.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/Frontend/CompilerInstance.cpp') diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index 27f96b0974..d4a351394a 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -890,7 +890,8 @@ CompilerInstance::loadModule(SourceLocation ImportLoc, 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 @@ CompilerInstance::loadModule(SourceLocation ImportLoc, 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 @@ CompilerInstance::loadModule(SourceLocation ImportLoc, } void CompilerInstance::makeModuleVisible(Module *Mod, - Module::NameVisibilityKind Visibility){ - ModuleManager->makeModuleVisible(Mod, Visibility); + Module::NameVisibilityKind Visibility, + SourceLocation ImportLoc){ + ModuleManager->makeModuleVisible(Mod, Visibility, ImportLoc); } -- cgit v1.2.3-18-g5258