Apply Aton's LLVM patch for PR973: Linux ctors / dtors support.

[oota-llvm.git] / lib / Support / GraphWriter.cpp

diff --git a/lib/Support/GraphWriter.cpp b/lib/Support/GraphWriter.cpp
index 73126e29258c76c579ada9c8723604f37f50aecf..fa9830a34b3643eba537dcfbfc765019cc479adf 100644 (file)
--- a/lib/Support/GraphWriter.cpp
+++ b/lib/Support/GraphWriter.cpp
@@ -11,18 +11,15 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/Support/GraphWriter.h"
 #include "llvm/System/Path.h"
 #include "llvm/System/Program.h"
 #include "llvm/Config/config.h"
-
 #include <iostream>
-
 using namespace llvm;
 
-namespace llvm {
-
-void DisplayGraph(const sys::Path& Filename)
-{
+void llvm::DisplayGraph(const sys::Path &Filename) {
+  std::string ErrMsg;
 #if HAVE_GRAPHVIZ
   sys::Path Graphviz(LLVM_PATH_GRAPHVIZ);
 
@@ -32,8 +29,8 @@ void 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;
@@ -52,8 +49,8 @@ void 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";
 
@@ -63,7 +60,10 @@ void DisplayGraph(const sys::Path& Filename)
     args.push_back(PSFilename.c_str());
     args.push_back(0);
     
-    sys::Program::ExecuteAndWait(gv, &args[0]);
+    ErrMsg.clear();
+    if (sys::Program::ExecuteAndWait(gv, &args[0],0,0,0,&ErrMsg)) {
+      std::cerr << "Error viewing graph: " << ErrMsg << "\n";
+    }
   }
   PSFilename.eraseFromDisk();
 #elif HAVE_DOTTY
@@ -74,10 +74,10 @@ void 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.
+#ifdef __MINGW32__ // Dotty spawns another app and doesn't wait until it returns
     return;
 #endif
   }
@@ -85,5 +85,3 @@ void DisplayGraph(const sys::Path& Filename)
   
   Filename.eraseFromDisk();
 }
-
-} // End llvm namespace