6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-13 04:38:24 +00:00
Code Issues Projects Releases Wiki Activity

For PR797:

Browse Source 
Adjust usage of the ExecuteAndWait function to use the last argument which
is the ErrMsg string. This is necessitated because this function no longer
throws exceptions on error.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29791 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Spencer
2006-08-21 06:04:45 +00:00
parent 4ce5dc6377
commit 8ea5ecb056
10 changed files with 109 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Support/GraphWriter.cpp
View File

@ -19,6 +19,7 @@
using namespace llvm;
void llvm::DisplayGraph(const sys::Path &Filename) {
std::string ErrMsg;
#if HAVE_GRAPHVIZ
sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
@ -28,8 +29,8 @@ void llvm::DisplayGraph(const sys::Path &Filename) {
args.push_back(0);
std::cerr << "Running 'Graphviz' program... " << std::flush;
if (sys::Program::ExecuteAndWait(Graphviz, &args[0])) {
std::cerr << "Error viewing graph: 'Graphviz' not in path?\n";
if (sys::Program::ExecuteAndWait(Graphviz, &args[0],0,0,0,&ErrMsg)) {
std::cerr << "Error viewing graph: " << ErrMsg << "\n";
}
#elif (HAVE_GV && HAVE_DOT)
sys::Path PSFilename = Filename;
@ -48,8 +49,8 @@ void llvm::DisplayGraph(const sys::Path &Filename) {
args.push_back(0);
std::cerr << "Running 'dot' program... " << std::flush;
if (sys::Program::ExecuteAndWait(dot, &args[0])) {
std::cerr << "Error viewing graph: 'dot' not in path?\n";
if (sys::Program::ExecuteAndWait(dot, &args[0],0,0,0,&ErrMsg)) {
std::cerr << "Error viewing graph: '" << ErrMsg << "\n";
} else {
std::cerr << " done. \n";
@ -59,8 +60,9 @@ void llvm::DisplayGraph(const sys::Path &Filename) {
args.push_back(PSFilename.c_str());
args.push_back(0);
if (sys::Program::ExecuteAndWait(gv, &args[0])) {
std::cerr << "Error viewing graph: 'gv' not in path?\n";
ErrMsg.clear();
if (sys::Program::ExecuteAndWait(gv, &args[0],0,0,0,&ErrMsg)) {
std::cerr << "Error viewing graph: " << ErrMsg << "\n";
}
}
PSFilename.eraseFromDisk();
@ -72,8 +74,8 @@ void llvm::DisplayGraph(const sys::Path &Filename) {
args.push_back(0);
std::cerr << "Running 'dotty' program... " << std::flush;
if (sys::Program::ExecuteAndWait(dotty, &args[0])) {
std::cerr << "Error viewing graph: 'dotty' not in path?\n";
if (sys::Program::ExecuteAndWait(dotty, &args[0],0,0,0,&ErrMsg)) {
std::cerr << "Error viewing graph: " << ErrMsg << "\n";
} else {
#ifdef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns.
return;