Get rid of GlobalLanguageMap. Global state is evil.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@56462 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/llvmc2/llvmc.cpp b/tools/llvmc2/llvmc.cpp
index e073845..08a5989 100644
--- a/tools/llvmc2/llvmc.cpp
+++ b/tools/llvmc2/llvmc.cpp
@@ -55,14 +55,14 @@
namespace {
/// BuildTargets - A small wrapper for CompilationGraph::Build.
- int BuildTargets(CompilationGraph& graph) {
+ int BuildTargets(CompilationGraph& graph, const LanguageMap& langMap) {
int ret;
const sys::Path& tempDir = SaveTemps
? sys::Path("")
: sys::Path(sys::Path::GetTemporaryDirectory());
try {
- ret = graph.Build(tempDir);
+ ret = graph.Build(tempDir, langMap);
}
catch(...) {
tempDir.eraseFromDisk(true);
@@ -77,10 +77,13 @@
int main(int argc, char** argv) {
try {
+ LanguageMap langMap;
CompilationGraph graph;
cl::ParseCommandLineOptions
(argc, argv, "LLVM Compiler Driver (Work In Progress)", true);
+
+ PopulateLanguageMap(langMap);
PopulateCompilationGraph(graph);
if (WriteGraph) {
@@ -98,7 +101,7 @@
throw std::runtime_error("no input files");
}
- return BuildTargets(graph);
+ return BuildTargets(graph, langMap);
}
catch(llvmc::error_code& ec) {
return ec.code();