[llvm-commits] [poolalloc] r104530 - in /poolalloc/trunk/tools: Makefile Pa/pa.cpp

[John Criswell]

Author: criswell
Date: Mon May 24 13:43:51 2010
New Revision: 104530

URL: http://llvm.org/viewvc/llvm-project?rev=104530&view=rev
Log:
Fixed compilation of the Pa tool under LLVM 2.7 and made it build by default.

Modified:
    poolalloc/trunk/tools/Makefile
    poolalloc/trunk/tools/Pa/pa.cpp

Modified: poolalloc/trunk/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/tools/Makefile?rev=104530&r1=104529&r2=104530&view=diff
==============================================================================
--- poolalloc/trunk/tools/Makefile (original)
+++ poolalloc/trunk/tools/Makefile Mon May 24 13:43:51 2010
@@ -6,6 +6,6 @@
 #
 # List all of the subdirectories that we will compile.
 #
-PARALLEL_DIRS=WatchDog
+PARALLEL_DIRS=WatchDog Pa
 
 include $(LEVEL)/Makefile.common

Modified: poolalloc/trunk/tools/Pa/pa.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/tools/Pa/pa.cpp?rev=104530&r1=104529&r2=104530&view=diff
==============================================================================
--- poolalloc/trunk/tools/Pa/pa.cpp (original)
+++ poolalloc/trunk/tools/Pa/pa.cpp Mon May 24 13:43:51 2010
@@ -13,6 +13,7 @@
 //
 //===--------------------------------------------------------------------===//
 
+#include "llvm/Config/config.h"
 #include "llvm/Module.h"
 #include "llvm/LLVMContext.h"
 #include "llvm/Bitcode/ReaderWriter.h"
@@ -26,7 +27,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/System/Signals.h"
-#include "llvm/Config/config.h"
+#include "llvm/Support/raw_os_ostream.h"
 
 #include "dsa/DSSupport.h"
 #include "dsa/DataStructure.h"
@@ -100,7 +101,8 @@
     Passes.add(createVerifierPass());
 
     // Figure out where we are going to send the output...
-    std::ostream *Out = 0;
+    raw_fd_ostream *Out = 0;
+    std::string error;
     if (OutputFilename != "") {
       if (OutputFilename != "-") {
         // Specified an output filename?
@@ -111,18 +113,18 @@
                     << "Use -f command line argument to force output\n";
           return 1;
         }
-        Out = new std::ofstream(OutputFilename.c_str());
+        Out = new raw_fd_ostream (OutputFilename.c_str(), error);
 
         // Make sure that the Out file gets unlinked from the disk if we get a
         // SIGINT
         sys::RemoveFileOnSignal(sys::Path(OutputFilename));
       } else {
-        Out = &std::cout;
+        Out = new raw_stdout_ostream();
       }
     } else {
       if (InputFilename == "-") {
         OutputFilename = "-";
-        Out = &std::cout;
+        Out = new raw_stdout_ostream();
       } else {
         OutputFilename = GetFileNameRoot(InputFilename);
 
@@ -137,8 +139,8 @@
           return 1;
       }
       
-      Out = new std::ofstream(OutputFilename.c_str());
-      if (!Out->good()) {
+      Out = new raw_fd_ostream(OutputFilename.c_str(), error);
+      if (error.length()) {
         std::cerr << argv[0] << ": error opening " << OutputFilename << "!\n";
         delete Out;
         return 1;
@@ -150,15 +152,13 @@
     }
     
     // Add the writing of the output file to the list of passes
-    Passes.add (CreateBitcodeWriterPass(*Out));
+    Passes.add (createBitcodeWriterPass(*Out));
 
     // Run our queue of passes all at once now, efficiently.
     Passes.run(*M.get());
 
-    
-
-    // Delete the ostream if it's not a stdout stream
-    if (Out != &std::cout) delete Out;
+    // Delete the ostream
+    delete Out;
   
     return 0;
   } catch (msg) {