[llvm-commits] [llvm] r50971 - in /llvm/trunk/tools/llvmc2: CompilationGraph.cpp Error.h llvmc.cpp

[Mikhail Glushenkov]

Author: foldr
Date: Mon May 12 11:31:42 2008
New Revision: 50971

URL: http://llvm.org/viewvc/llvm-project?rev=50971&view=rev
Log:
Fix some error messages; Make LLVMC pass through the exit code of a failed tool.

Added:
    llvm/trunk/tools/llvmc2/Error.h
Modified:
    llvm/trunk/tools/llvmc2/CompilationGraph.cpp
    llvm/trunk/tools/llvmc2/llvmc.cpp

Modified: llvm/trunk/tools/llvmc2/CompilationGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/CompilationGraph.cpp?rev=50971&r1=50970&r2=50971&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/CompilationGraph.cpp (original)
+++ llvm/trunk/tools/llvmc2/CompilationGraph.cpp Mon May 12 11:31:42 2008
@@ -11,6 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "Error.h"
 #include "CompilationGraph.h"
 
 #include "llvm/ADT/STLExtras.h"
@@ -90,7 +91,7 @@
 const std::string& CompilationGraph::getLanguage(const sys::Path& File) const {
   LanguageMap::const_iterator Lang = ExtsToLangs.find(File.getSuffix());
   if (Lang == ExtsToLangs.end())
-    throw std::runtime_error("Unknown suffix: " + File.getSuffix() + '!');
+    throw std::runtime_error("Unknown suffix: " + File.getSuffix());
   return Lang->second;
 }
 
@@ -101,7 +102,7 @@
   tools_map_type::const_iterator I = ToolsMap.find(LangName);
   if (I == ToolsMap.end())
     throw std::runtime_error("No tool corresponding to the language "
-                             + LangName + "found!");
+                             + LangName + "found");
   return I->second;
 }
 
@@ -176,8 +177,8 @@
       Out = MakeTempFile(TempDir, In.getBasename(), CurTool->OutputSuffix());
     }
 
-    if (CurTool->GenerateAction(In, Out).Execute() != 0)
-      throw std::runtime_error("Tool returned error code!");
+    if (int ret = CurTool->GenerateAction(In, Out).Execute())
+      throw error_code(ret);
 
     if (Last)
       return;
@@ -205,8 +206,8 @@
   // Find the toolchain for the input language.
   const tools_vector_type& TV = getToolsVector(InLanguage);
   if (TV.empty())
-    throw std::runtime_error("No toolchain corresponding to language"
-                             + InLanguage + " found!");
+    throw std::runtime_error("No toolchain corresponding to language "
+                             + InLanguage + " found");
   return &getNode(ChooseEdge(TV, InLangs)->ToolName());
 }
 
@@ -342,8 +343,8 @@
       Out = MakeTempFile(TempDir, "tmp", JT->OutputSuffix());
     }
 
-    if (JT->GenerateAction(Out).Execute() != 0)
-      throw std::runtime_error("Tool returned error code!");
+    if (int ret = JT->GenerateAction(Out).Execute())
+      throw error_code(ret);
 
     if (!IsLast) {
       const Node* NextNode =
@@ -397,7 +398,7 @@
     O.close();
   }
   else {
-    throw std::runtime_error("");
+    throw std::runtime_error("Error opening file for writing");
   }
 }
 

Added: llvm/trunk/tools/llvmc2/Error.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/Error.h?rev=50971&view=auto

==============================================================================
--- llvm/trunk/tools/llvmc2/Error.h (added)
+++ llvm/trunk/tools/llvmc2/Error.h Mon May 12 11:31:42 2008
@@ -0,0 +1,33 @@
+//===--- Error.h - The LLVM Compiler Driver ---------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open
+// Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+//  Exception classes for LLVMC.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_TOOLS_LLVMC2_ERROR_H
+#define LLVM_TOOLS_LLVMC2_ERROR_H
+
+#include <stdexcept>
+
+namespace llvmc {
+
+  class error_code: public std::runtime_error {
+    int Code_;
+  public:
+    error_code (int c)
+      : std::runtime_error("Tool returned error code"), Code_(c)
+    {}
+
+    int code() const { return Code_; }
+  };
+
+}
+
+#endif //LLVM_TOOLS_LLVMC2_ERROR_H

Modified: llvm/trunk/tools/llvmc2/llvmc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/llvmc.cpp?rev=50971&r1=50970&r2=50971&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc2/llvmc.cpp (original)
+++ llvm/trunk/tools/llvmc2/llvmc.cpp Mon May 12 11:31:42 2008
@@ -15,6 +15,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "CompilationGraph.h"
+#include "Error.h"
 #include "Tool.h"
 
 #include "llvm/System/Path.h"
@@ -92,6 +93,9 @@
 
     return BuildTargets(graph);
   }
+  catch(llvmc::error_code& ec) {
+    return ec.code();
+  }
   catch(const std::exception& ex) {
     std::cerr << ex.what() << '\n';
   }