Remove unnecessary gotos to fall-thru successors.

[oota-llvm.git] / lib / CompilerDriver / Main.cpp

diff --git a/lib/CompilerDriver/Main.cpp b/lib/CompilerDriver/Main.cpp
index 6807a830063892ed61a03afbc8926194fae5815d..c581809d04b96d785714751a70206249815b2bcc 100644 (file)
--- a/lib/CompilerDriver/Main.cpp
+++ b/lib/CompilerDriver/Main.cpp
@@ -16,9 +16,9 @@
 #include "llvm/CompilerDriver/Error.h"
 #include "llvm/CompilerDriver/Plugin.h"
 
+#include "llvm/Support/raw_ostream.h"
 #include "llvm/System/Path.h"
 
-#include <iostream>
 #include <stdexcept>
 #include <string>
 
@@ -31,20 +31,29 @@ namespace {
   sys::Path getTempDir() {
     sys::Path tempDir;
 
+    // The --temp-dir option.
+    if (!TempDirname.empty()) {
+      tempDir = TempDirname;
+    }
     // GCC 4.5-style -save-temps handling.
-    if (SaveTemps == SaveTempsEnum::Unset) {
+    else if (SaveTemps == SaveTempsEnum::Unset) {
       tempDir = sys::Path::GetTemporaryDirectory();
+      return tempDir;
     }
     else if (SaveTemps == SaveTempsEnum::Obj && !OutputFilename.empty()) {
       tempDir = OutputFilename;
+      tempDir = tempDir.getDirname();
+    }
+    else {
+      // SaveTemps == Cwd --> use current dir (leave tempDir empty).
+      return tempDir;
+    }
 
-      if (!tempDir.exists()) {
-        std::string ErrMsg;
-        if (tempDir.createDirectoryOnDisk(true, &ErrMsg))
-          throw std::runtime_error(ErrMsg);
-      }
+    if (!tempDir.exists()) {
+      std::string ErrMsg;
+      if (tempDir.createDirectoryOnDisk(true, &ErrMsg))
+        throw std::runtime_error(ErrMsg);
     }
-    // else if (SaveTemps == Cwd) -> use current dir (leave tempDir empty)
 
     return tempDir;
   }
@@ -53,17 +62,18 @@ namespace {
   int BuildTargets(CompilationGraph& graph, const LanguageMap& langMap) {
     int ret;
     const sys::Path& tempDir = getTempDir();
+    bool toDelete = (SaveTemps == SaveTempsEnum::Unset);
 
     try {
       ret = graph.Build(tempDir, langMap);
     }
     catch(...) {
-      if (SaveTemps == SaveTempsEnum::Unset)
+      if (toDelete)
         tempDir.eraseFromDisk(true);
       throw;
     }
 
-    if (SaveTemps == SaveTempsEnum::Unset)
+    if (toDelete)
       tempDir.eraseFromDisk(true);
     return ret;
   }
@@ -71,22 +81,26 @@ namespace {
 
 namespace llvmc {
 
+// Sometimes plugins want to condition on the value in argv[0].
+const char* ProgramName;
+
 int Main(int argc, char** argv) {
   try {
     LanguageMap langMap;
     CompilationGraph graph;
 
+    ProgramName = argv[0];
+
     cl::ParseCommandLineOptions
       (argc, argv, "LLVM Compiler Driver (Work In Progress)", true);
 
     PluginLoader Plugins;
-    Plugins.PopulateLanguageMap(langMap);
-    Plugins.PopulateCompilationGraph(graph);
+    Plugins.RunInitialization(langMap, graph);
 
     if (CheckGraph) {
       int ret = graph.Check();
       if (!ret)
-        std::cerr << "check-graph: no errors found.\n";
+        llvm::errs() << "check-graph: no errors found.\n";
 
       return ret;
     }
@@ -114,10 +128,10 @@ int Main(int argc, char** argv) {
     return ec.code();
   }
   catch(const std::exception& ex) {
-    std::cerr << argv[0] << ": " << ex.what() << '\n';
+    llvm::errs() << argv[0] << ": " << ex.what() << '\n';
   }
   catch(...) {
-    std::cerr << argv[0] << ": unknown error!\n";
+    llvm::errs() << argv[0] << ": unknown error!\n";
   }
   return 1;
 }