Driver: Give Compilation::Execute total control over the Driver result

code; and don't return an error code when -### is present, even if
errors occur.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67425 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Driver/Driver.h b/include/clang/Driver/Driver.h
index 2a91842884025f6ba9b7913ebd21283880f8fad3..7a52498364b0a8027f934098217be78a143f9240 100644 (file)
--- a/include/clang/Driver/Driver.h
+++ b/include/clang/Driver/Driver.h
@@ -109,6 +109,8 @@ public:
 
   const OptTable &getOpts() const { return *Opts; }
 
+  const Diagnostic &getDiags() const { return Diags; }
+
   /// @}
   /// @name Primary Functionality
   /// @{

diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp
index 48796afd8276fb6b4a481ef7518e08cb866a40db..a2fc9212a511035f0355f0d51146b66299786ead 100644 (file)
--- a/lib/Driver/Compilation.cpp
+++ b/lib/Driver/Compilation.cpp
@@ -160,6 +160,10 @@ int Compilation::Execute() const {
     return 0;
   }
 
+  // If there were errors building the compilation, quit now.
+  if (getDriver().getDiags().getNumErrors())
+    return 1;
+
   int Res = ExecuteJob(Jobs);
   
   // Remove temp files.

diff --git a/tools/driver/driver.cpp b/tools/driver/driver.cpp
index 865b57c5aba675e8972d6c2ee387c073ea5c8bf7..b22776119710c44a31685d1b2e2dc512c03de4e3 100644 (file)
--- a/tools/driver/driver.cpp
+++ b/tools/driver/driver.cpp
@@ -87,15 +87,11 @@ int main(int argc, const char **argv) {
                                                
   llvm::OwningPtr<Compilation> C(TheDriver->BuildCompilation(argc, argv));
 
-  // If there were errors building the compilation, quit now.
-  if (Diags.getNumErrors())
-    return 1;
-  if (!C.get())
-    return 0;
-
-  int res = C->Execute();
+  int Res = 0;
+  if (C.get())
+    Res = C->Execute();
 
   llvm::llvm_shutdown();
 
-  return res;
+  return Res;
 }