aboutsummaryrefslogtreecommitdiff
path: root/lib/Support
diff options
context:
space:
mode:
authorAndrew Trick <atrick@apple.com>2011-05-11 16:31:24 +0000
committerAndrew Trick <atrick@apple.com>2011-05-11 16:31:24 +0000
commit7c863eb8cc34c8ae97ae90672758eb6637b1125f (patch)
tree25fd978fd971992c33ff05b6845be93ba0c6c685 /lib/Support
parentde5d5ded6440f6c3e364f4f31bada108ad2d74a4 (diff)
Bugpoint support for miscompilations that result in a crash.
This change allows bugpoint to pinpoint the "opt" pass and bitcode segment responsible for a crash caused by miscompilation. At least it works well for me now, without having to create any custom execution wrappers. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@131186 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support')
-rw-r--r--lib/Support/Program.cpp5
-rw-r--r--lib/Support/Unix/Program.inc7
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/Support/Program.cpp b/lib/Support/Program.cpp
index 01860b082d..fa816f68c8 100644
--- a/lib/Support/Program.cpp
+++ b/lib/Support/Program.cpp
@@ -28,10 +28,11 @@ Program::ExecuteAndWait(const Path& path,
const Path** redirects,
unsigned secondsToWait,
unsigned memoryLimit,
- std::string* ErrMsg) {
+ std::string* ErrMsg,
+ const char* SignalPrefix) {
Program prg;
if (prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg))
- return prg.Wait(path, secondsToWait, ErrMsg);
+ return prg.Wait(path, secondsToWait, ErrMsg, SignalPrefix);
else
return -1;
}
diff --git a/lib/Support/Unix/Program.inc b/lib/Support/Unix/Program.inc
index 9f0a9ef052..86f3aa9eac 100644
--- a/lib/Support/Unix/Program.inc
+++ b/lib/Support/Unix/Program.inc
@@ -298,7 +298,8 @@ Program::Execute(const Path &path, const char **args, const char **envp,
int
Program::Wait(const sys::Path &path,
unsigned secondsToWait,
- std::string* ErrMsg)
+ std::string* ErrMsg,
+ const char* SignalPrefix)
{
#ifdef HAVE_SYS_WAIT_H
struct sigaction Act, Old;
@@ -376,7 +377,9 @@ Program::Wait(const sys::Path &path,
}
} else if (WIFSIGNALED(status)) {
if (ErrMsg) {
- *ErrMsg = strsignal(WTERMSIG(status));
+ if (SignalPrefix)
+ *ErrMsg = SignalPrefix;
+ *ErrMsg += strsignal(WTERMSIG(status));
#ifdef WCOREDUMP
if (WCOREDUMP(status))
*ErrMsg += " (core dumped)";