[llvm-commits] CVS: llvm/lib/Support/GraphWriter.cpp

[Reid Spencer]

Changes in directory llvm/lib/Support:

GraphWriter.cpp updated: 1.3 -> 1.4
---
Log message:

For PR797: http://llvm.org/PR797 :
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.


---
Diffs of the changes:  (+10 -8)

 GraphWriter.cpp |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)


Index: llvm/lib/Support/GraphWriter.cpp
diff -u llvm/lib/Support/GraphWriter.cpp:1.3 llvm/lib/Support/GraphWriter.cpp:1.4
--- llvm/lib/Support/GraphWriter.cpp:1.3	Sun Aug 20 21:04:43 2006
+++ llvm/lib/Support/GraphWriter.cpp	Mon Aug 21 01:04:45 2006
@@ -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 @@
   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 @@
   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 @@
     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 @@
   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;