diff options
Diffstat (limited to 'llvm/tools/bugpoint/ToolRunner.cpp')
| -rw-r--r-- | llvm/tools/bugpoint/ToolRunner.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/llvm/tools/bugpoint/ToolRunner.cpp b/llvm/tools/bugpoint/ToolRunner.cpp index 6c46ef18eb6..9c3e6121f23 100644 --- a/llvm/tools/bugpoint/ToolRunner.cpp +++ b/llvm/tools/bugpoint/ToolRunner.cpp @@ -50,6 +50,11 @@ namespace { cl::desc("Remote execution (rsh/ssh) extra options")); } +// Add a prefix to ErrMsg if the program is terminated by a signal to +// distinguish compiled program crashes from other execution +// failures. Miscompilation likely to results in SIGSEGV. +static const char *SignalPrefix = "Signal - "; + /// RunProgramWithTimeout - This function provides an alternate interface /// to the sys::Program::ExecuteAndWait interface. /// @see sys::Program::ExecuteAndWait @@ -77,7 +82,7 @@ static int RunProgramWithTimeout(const sys::Path &ProgramPath, return sys::Program::ExecuteAndWait(ProgramPath, Args, 0, redirects, - NumSeconds, MemoryLimit, ErrMsg); + NumSeconds, MemoryLimit, ErrMsg, SignalPrefix); } /// RunProgramRemotelyWithTimeout - This function runs the given program @@ -854,9 +859,18 @@ int GCC::ExecuteProgram(const std::string &ProgramFile, if (RemoteClientPath.isEmpty()) { DEBUG(errs() << "<run locally>"); - return RunProgramWithTimeout(OutputBinary, &ProgramArgs[0], + int ExitCode = RunProgramWithTimeout(OutputBinary, &ProgramArgs[0], sys::Path(InputFile), sys::Path(OutputFile), sys::Path(OutputFile), Timeout, MemoryLimit, Error); + // Treat a signal (usually SIGSEGV) as part of the program output so that + // crash-causing miscompilation is handled seamlessly. + if (Error->find(SignalPrefix) == 0) { + std::ofstream outFile(OutputFile.c_str(), std::ios_base::app); + outFile << *Error << '\n'; + outFile.close(); + Error->clear(); + } + return ExitCode; } else { outs() << "<run remotely>"; outs().flush(); return RunProgramRemotelyWithTimeout(sys::Path(RemoteClientPath), |
