[cfe-commits] r59221 - in /cfe/trunk: Driver/AnalysisConsumer.cpp Driver/Backend.cpp Driver/CacheTokens.cpp Driver/PrintPreprocessedOutput.cpp Driver/RewriteMacros.cpp Driver/RewriteObjC.cpp Driver/SerializationTest.cpp lib/AST/InheritViz.cpp lib/Driver/PlistDiagnostics.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Nov 12 23:09:21 2008
New Revision: 59221

URL: http://llvm.org/viewvc/llvm-project?rev=59221&view=rev
Log:
[LLVM up] Update for raw_fd_ostream change. This fixes a FIXME that
the Backend output should be done in binary mode.
 - I'd appreciate it if someone who has a Windows build could verify
   this.

Modified:
    cfe/trunk/Driver/AnalysisConsumer.cpp
    cfe/trunk/Driver/Backend.cpp
    cfe/trunk/Driver/CacheTokens.cpp
    cfe/trunk/Driver/PrintPreprocessedOutput.cpp
    cfe/trunk/Driver/RewriteMacros.cpp
    cfe/trunk/Driver/RewriteObjC.cpp
    cfe/trunk/Driver/SerializationTest.cpp
    cfe/trunk/lib/AST/InheritViz.cpp
    cfe/trunk/lib/Driver/PlistDiagnostics.cpp

Modified: cfe/trunk/Driver/AnalysisConsumer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/AnalysisConsumer.cpp?rev=59221&r1=59220&r2=59221&view=diff

==============================================================================
--- cfe/trunk/Driver/AnalysisConsumer.cpp (original)
+++ cfe/trunk/Driver/AnalysisConsumer.cpp Wed Nov 12 23:09:21 2008
@@ -554,7 +554,7 @@
   
   llvm::OwningPtr<llvm::raw_fd_ostream> Stream;
   std::string filename = Filename.toString();
-  Stream.reset(new llvm::raw_fd_ostream(filename.c_str(), ErrMsg));
+  Stream.reset(new llvm::raw_fd_ostream(filename.c_str(), false, ErrMsg));
 
   if (!ErrMsg.empty())
     return 0;

Modified: cfe/trunk/Driver/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/Backend.cpp?rev=59221&r1=59220&r2=59221&view=diff

==============================================================================
--- cfe/trunk/Driver/Backend.cpp (original)
+++ cfe/trunk/Driver/Backend.cpp Wed Nov 12 23:09:21 2008
@@ -170,8 +170,7 @@
       OutputFile = Path.toString();
     }
 
-    // FIXME: Should be binary.
-    AsmOutStream = new raw_fd_ostream(OutputFile.c_str(), Error);
+    AsmOutStream = new raw_fd_ostream(OutputFile.c_str(), true, Error);
     if (!Error.empty())
       return false;
   }

Modified: cfe/trunk/Driver/CacheTokens.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/CacheTokens.cpp?rev=59221&r1=59220&r2=59221&view=diff

==============================================================================
--- cfe/trunk/Driver/CacheTokens.cpp (original)
+++ cfe/trunk/Driver/CacheTokens.cpp Wed Nov 12 23:09:21 2008
@@ -115,7 +115,7 @@
   uint32_t idcount = 0;
   
   std::string ErrMsg;
-  llvm::raw_fd_ostream Out(OutFile.c_str(), ErrMsg);
+  llvm::raw_fd_ostream Out(OutFile.c_str(), true, ErrMsg);
   
   if (!ErrMsg.empty()) {
     os << "PCH error: " << ErrMsg << "\n";

Modified: cfe/trunk/Driver/PrintPreprocessedOutput.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/PrintPreprocessedOutput.cpp?rev=59221&r1=59220&r2=59221&view=diff

==============================================================================
--- cfe/trunk/Driver/PrintPreprocessedOutput.cpp (original)
+++ cfe/trunk/Driver/PrintPreprocessedOutput.cpp Wed Nov 12 23:09:21 2008
@@ -476,7 +476,7 @@
   
   // Open the output buffer.
   std::string Err;
-  llvm::raw_fd_ostream OS(OutFile.empty() ? "-" : OutFile.c_str(), Err);
+  llvm::raw_fd_ostream OS(OutFile.empty() ? "-" : OutFile.c_str(), false, Err);
   if (!Err.empty()) {
     fprintf(stderr, "%s\n", Err.c_str());
     exit(1);

Modified: cfe/trunk/Driver/RewriteMacros.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/RewriteMacros.cpp?rev=59221&r1=59220&r2=59221&view=diff

==============================================================================
--- cfe/trunk/Driver/RewriteMacros.cpp (original)
+++ cfe/trunk/Driver/RewriteMacros.cpp Wed Nov 12 23:09:21 2008
@@ -212,7 +212,7 @@
     OutFile = &llvm::outs();
   } else if (!OutFileName.empty()) {
     std::string Err;
-    OutFile = new llvm::raw_fd_ostream(OutFileName.c_str(), Err);
+    OutFile = new llvm::raw_fd_ostream(OutFileName.c_str(), false, Err);
     OwnedStream.reset(OutFile);
   } else if (InFileName == "-") {
     OutFile = &llvm::outs();
@@ -221,7 +221,7 @@
     Path.eraseSuffix();
     Path.appendSuffix("cpp");
     std::string Err;
-    OutFile = new llvm::raw_fd_ostream(Path.toString().c_str(), Err);
+    OutFile = new llvm::raw_fd_ostream(Path.toString().c_str(), false, Err);
     OwnedStream.reset(OutFile);
   }
 

Modified: cfe/trunk/Driver/RewriteObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/RewriteObjC.cpp?rev=59221&r1=59220&r2=59221&view=diff

==============================================================================
--- cfe/trunk/Driver/RewriteObjC.cpp (original)
+++ cfe/trunk/Driver/RewriteObjC.cpp Wed Nov 12 23:09:21 2008
@@ -4107,7 +4107,7 @@
     OutFile = &llvm::outs();
   } else if (!OutFileName.empty()) {
     std::string Err;
-    OutFile = new llvm::raw_fd_ostream(OutFileName.c_str(), Err);
+    OutFile = new llvm::raw_fd_ostream(OutFileName.c_str(), false, Err);
     OwnedStream.reset(OutFile);
   } else if (InFileName == "-") {
     OutFile = &llvm::outs();
@@ -4116,7 +4116,7 @@
     Path.eraseSuffix();
     Path.appendSuffix("cpp");
     std::string Err;
-    OutFile = new llvm::raw_fd_ostream(Path.toString().c_str(), Err);
+    OutFile = new llvm::raw_fd_ostream(Path.toString().c_str(), false, Err);
     OwnedStream.reset(OutFile);
   }
   

Modified: cfe/trunk/Driver/SerializationTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/SerializationTest.cpp?rev=59221&r1=59220&r2=59221&view=diff

==============================================================================
--- cfe/trunk/Driver/SerializationTest.cpp (original)
+++ cfe/trunk/Driver/SerializationTest.cpp Wed Nov 12 23:09:21 2008
@@ -65,7 +65,7 @@
   { 
     // Pretty-print the decls to a temp file.
     std::string Err;
-    llvm::raw_fd_ostream DeclPP(FNameDeclPrint.c_str(), Err);
+    llvm::raw_fd_ostream DeclPP(FNameDeclPrint.c_str(), true, Err);
     assert (Err.empty() && "Could not open file for printing out decls.");
     llvm::OwningPtr<ASTConsumer> FilePrinter(CreateASTPrinter(&DeclPP));
     
@@ -89,7 +89,7 @@
   {
     // Pretty-print the deserialized decls to a temp file.
     std::string Err;
-    llvm::raw_fd_ostream DeclPP(FNameDeclPrint.c_str(), Err);
+    llvm::raw_fd_ostream DeclPP(FNameDeclPrint.c_str(), true, Err);
     assert (Err.empty() && "Could not open file for printing out decls.");
     llvm::OwningPtr<ASTConsumer> FilePrinter(CreateASTPrinter(&DeclPP));
     

Modified: cfe/trunk/lib/AST/InheritViz.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/InheritViz.cpp?rev=59221&r1=59220&r2=59221&view=diff

==============================================================================
--- cfe/trunk/lib/AST/InheritViz.cpp (original)
+++ cfe/trunk/lib/AST/InheritViz.cpp Wed Nov 12 23:09:21 2008
@@ -149,7 +149,7 @@
 
   llvm::errs() << "Writing '" << Filename.c_str() << "'... ";
 
-  llvm::raw_fd_ostream O(Filename.c_str(), ErrMsg);
+  llvm::raw_fd_ostream O(Filename.c_str(), false, ErrMsg);
 
   if (ErrMsg.empty()) {
     InheritanceHierarchyWriter Writer(Context, O);

Modified: cfe/trunk/lib/Driver/PlistDiagnostics.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/PlistDiagnostics.cpp?rev=59221&r1=59220&r2=59221&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/PlistDiagnostics.cpp (original)
+++ cfe/trunk/lib/Driver/PlistDiagnostics.cpp Wed Nov 12 23:09:21 2008
@@ -195,7 +195,7 @@
   
   // Now create the plist file.
   std::string ErrMsg;
-  llvm::raw_fd_ostream o(H.toString().c_str(), ErrMsg);
+  llvm::raw_fd_ostream o(H.toString().c_str(), false, ErrMsg);
   
   if (!ErrMsg.empty()) {
     llvm::errs() << "warning: could not creat file: " << H.toString() << '\n';