summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/CompilerInstance.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2012-11-30 22:11:57 +0000
committerDouglas Gregor <dgregor@apple.com>2012-11-30 22:11:57 +0000
commit6336543195e8a103032c33f7cc874ea162ec5c02 (patch)
treeabe3f3b96a061963ea03615a020a8f04ec1be307 /clang/lib/Frontend/CompilerInstance.cpp
parentc786b31233f58b8edb2909bf94a072041aae0119 (diff)
downloadbcm5719-llvm-6336543195e8a103032c33f7cc874ea162ec5c02.tar.gz
bcm5719-llvm-6336543195e8a103032c33f7cc874ea162ec5c02.zip
Rename ModuleBuildPath -> ModuleBuildStack. Thanks, Dmitri!
llvm-svn: 169045
Diffstat (limited to 'clang/lib/Frontend/CompilerInstance.cpp')
-rw-r--r--clang/lib/Frontend/CompilerInstance.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp
index 150f99578c4..d481ebf511c 100644
--- a/clang/lib/Frontend/CompilerInstance.cpp
+++ b/clang/lib/Frontend/CompilerInstance.cpp
@@ -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;
OpenPOWER on IntegriCloud