replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For ModuleLoader::makeModuleVisible() also pass the source location where the 

module import occurred.

llvm-svn: 174191
This commit is contained in:
Argyrios Kyrtzidis 2013-02-01 16:36:12 +00:00
parent 22c22f5f9a
commit 125df0589b
11 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/Frontend/ASTUnit.h
View File

@ -839,7 +839,8 @@ public:
}
virtual void makeModuleVisible(Module *Mod,
Module::NameVisibilityKind Visibility) { }
Module::NameVisibilityKind Visibility,
SourceLocation ImportLoc) { }
};

3
clang/include/clang/Frontend/CompilerInstance.h
View File

@ -662,7 +662,8 @@ public:
bool IsInclusionDirective);
virtual void makeModuleVisible(Module *Mod,
Module::NameVisibilityKind Visibility);
Module::NameVisibilityKind Visibility,
SourceLocation ImportLoc);
};

3
clang/include/clang/Lex/ModuleLoader.h
View File

@ -82,7 +82,8 @@ public:
/// \brief Make the given module visible.
virtual void makeModuleVisible(Module *Mod,
Module::NameVisibilityKind Visibility) = 0;
Module::NameVisibilityKind Visibility,
SourceLocation ImportLoc) = 0;
};
}

3
clang/include/clang/Serialization/ASTReader.h
View File

@ -1164,7 +1164,8 @@ public:
/// \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);

10
clang/lib/Frontend/CompilerInstance.cpp
View File

@ -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);
}

2
clang/lib/Sema/SemaDecl.cpp
View File

@ -11514,7 +11514,7 @@ void Sema::createImplicitModuleImport(SourceLocation Loc, Module *Mod) {
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,

6
clang/lib/Serialization/ASTReader.cpp
View File

@ -2591,7 +2591,8 @@ void ASTReader::makeNamesVisible(const HiddenNames &Names) {
}
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 @@ void ASTReader::InitializeContext() {
// 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();
}

3
clang/unittests/Basic/SourceManagerTest.cpp
View File

@ -60,7 +60,8 @@ class VoidModuleLoader : public ModuleLoader {
}
virtual void makeModuleVisible(Module *Mod,
Module::NameVisibilityKind Visibility) { }
Module::NameVisibilityKind Visibility,
SourceLocation ImportLoc) { }
};
TEST_F(SourceManagerTest, isBeforeInTranslationUnit) {

3
clang/unittests/Lex/LexerTest.cpp
View File

@ -61,7 +61,8 @@ class VoidModuleLoader : public ModuleLoader {
}
virtual void makeModuleVisible(Module *Mod,
Module::NameVisibilityKind Visibility) { }
Module::NameVisibilityKind Visibility,
SourceLocation ImportLoc) { }
};
TEST_F(LexerTest, LexAPI) {

3
clang/unittests/Lex/PPCallbacksTest.cpp
View File

@ -38,7 +38,8 @@ class VoidModuleLoader : public ModuleLoader {
}
virtual void makeModuleVisible(Module *Mod,
Module::NameVisibilityKind Visibility) { }
Module::NameVisibilityKind Visibility,
SourceLocation ImportLoc) { }
};
// Stub to collect data from InclusionDirective callbacks.

3
clang/unittests/Lex/PPConditionalDirectiveRecordTest.cpp
View File

@ -61,7 +61,8 @@ class VoidModuleLoader : public ModuleLoader {
}
virtual void makeModuleVisible(Module *Mod,
Module::NameVisibilityKind Visibility) { }
Module::NameVisibilityKind Visibility,
SourceLocation ImportLoc) { }
};
TEST_F(PPConditionalDirectiveRecordTest, PPRecAPI) {