#include "llvm/CompilerDriver/Action.h"
#include "llvm/CompilerDriver/BuiltinOptions.h"
+#include "llvm/CompilerDriver/Error.h"
+#include "llvm/CompilerDriver/Main.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/SystemUtils.h"
-#include "llvm/System/Program.h"
-#include "llvm/System/TimeValue.h"
+#include "llvm/Support/Program.h"
+#include "llvm/Support/TimeValue.h"
#include <stdexcept>
#include <string>
namespace llvmc {
-extern int Main(int argc, char** argv);
extern const char* ProgramName;
}
namespace {
- int ExecuteProgram(const std::string& name,
- const StrVector& args) {
- sys::Path prog = sys::Program::FindProgramByName(name);
-
- if (prog.isEmpty()) {
- prog = FindExecutable(name, ProgramName, (void *)(intptr_t)&Main);
- if (prog.isEmpty())
- throw std::runtime_error("Can't find program '" + name + "'");
+
+ void PrintString (const std::string& str) {
+ errs() << str << ' ';
+ }
+
+ void PrintCommand (const std::string& Cmd, const StrVector& Args) {
+ errs() << Cmd << ' ';
+ std::for_each(Args.begin(), Args.end(), &PrintString);
+ errs() << '\n';
+ }
+
+ bool IsSegmentationFault (int returnCode) {
+#ifdef LLVM_ON_WIN32
+ return (returnCode >= 0xc0000000UL)
+#else
+ return (returnCode < 0);
+#endif
+ }
+
+ int ExecuteProgram (const std::string& name, const StrVector& args) {
+ sys::Path prog(name);
+
+ if (sys::path::is_relative(prog.str())) {
+ prog = PrependMainExecutablePath(name, ProgramName,
+ (void *)(intptr_t)&Main);
+
+ if (!prog.canExecute()) {
+ prog = sys::Program::FindProgramByName(name);
+ if (prog.isEmpty()) {
+ PrintError("Can't find program '" + name + "'");
+ return -1;
+ }
+ }
+ }
+ if (!prog.canExecute()) {
+ PrintError("Program '" + name + "' is not executable.");
+ return -1;
}
- if (!prog.canExecute())
- throw std::runtime_error("Program '" + name + "' is not executable.");
// Build the command line vector and the redirects array.
const sys::Path* redirects[3] = {0,0,0};
argv.push_back(0); // null terminate list.
// Invoke the program.
- return sys::Program::ExecuteAndWait(prog, &argv[0], 0, &redirects[0]);
- }
+ int ret = sys::Program::ExecuteAndWait(prog, &argv[0], 0, &redirects[0]);
- void print_string (const std::string& str) {
- errs() << str << ' ';
+ if (IsSegmentationFault(ret)) {
+ errs() << "Segmentation fault: ";
+ PrintCommand(name, args);
+ }
+
+ return ret;
}
}
namespace llvmc {
- void AppendToGlobalTimeLog(const std::string& cmd, double time);
+ void AppendToGlobalTimeLog (const std::string& cmd, double time);
}
-int llvmc::Action::Execute() const {
- if (DryRun || VerboseMode) {
- errs() << Command_ << " ";
- std::for_each(Args_.begin(), Args_.end(), print_string);
- errs() << '\n';
- }
+int llvmc::Action::Execute () const {
+ if (DryRun || VerboseMode)
+ PrintCommand(Command_, Args_);
+
if (!DryRun) {
if (Time) {
sys::TimeValue now = sys::TimeValue::now();