nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ModuleBuildPath -> ModuleBuildStack. Thanks, Dmitri!

Browse Source 
llvm-svn: 169045
This commit is contained in:
Douglas Gregor
2012-11-30 22:11:57 +00:00
parent c786b31233
commit 6336543195
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -859,14 +859,14 @@ static void compileModule(CompilerInstance &ImportingInstance,
/*ShouldOwnClient=*/true,
/*ShouldCloneClient=*/true);
// Note that this module is part of the module build path, so that we
// Note that this module is part of the module build stack, so that we
// can detect cycles in the module graph.
Instance.createFileManager(); // FIXME: Adopt file manager from importer?
Instance.createSourceManager(Instance.getFileManager());
SourceManager &SourceMgr = Instance.getSourceManager();
SourceMgr.setModuleBuildPath(
ImportingInstance.getSourceManager().getModuleBuildPath());
SourceMgr.appendModuleBuildPath(Module->getTopLevelModuleName(),
SourceMgr.setModuleBuildStack(
ImportingInstance.getSourceManager().getModuleBuildStack());
SourceMgr.pushModuleBuildStack(Module->getTopLevelModuleName(),
FullSourceLoc(ImportLoc, ImportingInstance.getSourceManager()));
@@ -947,8 +947,8 @@ CompilerInstance::loadModule(SourceLocation ImportLoc,
// build the module.
// Check whether there is a cycle in the module graph.
ModuleBuildPath Path = getSourceManager().getModuleBuildPath();
ModuleBuildPath::iterator Pos = Path.begin(), PosEnd = Path.end();
ModuleBuildStack Path = getSourceManager().getModuleBuildStack();
ModuleBuildStack::iterator Pos = Path.begin(), PosEnd = Path.end();
for (; Pos != PosEnd; ++Pos) {
if (Pos->first == ModuleName)
break;