[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.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59221 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Driver/AnalysisConsumer.cpp b/Driver/AnalysisConsumer.cpp
index f606c877420d27cd7f9e796440803ea4d3a7d434..10e69686adc39f07eba81df0858b014269b81432 100644 (file)
--- a/Driver/AnalysisConsumer.cpp
+++ b/Driver/AnalysisConsumer.cpp
@@ -554,7 +554,7 @@ static ExplodedNodeImpl::Auditor* CreateUbiViz() {
   
   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;

diff --git a/Driver/Backend.cpp b/Driver/Backend.cpp
index f16c0694971478e038cf88817070cf713c37f0ff..aad2d0471445da6d9b655c2f6eddac2c20880b81 100644 (file)
--- a/Driver/Backend.cpp
+++ b/Driver/Backend.cpp
@@ -170,8 +170,7 @@ bool BackendConsumer::AddEmitPasses(std::string &Error) {
       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;
   }

diff --git a/Driver/CacheTokens.cpp b/Driver/CacheTokens.cpp
index 5aeb1a6da36c7e700bcb10aefcffe8f085cc697f..6b37830c00b766c2606396647eb2b473c5e6ffd5 100644 (file)
--- a/Driver/CacheTokens.cpp
+++ b/Driver/CacheTokens.cpp
@@ -115,7 +115,7 @@ void clang::CacheTokens(Preprocessor& PP, const std::string& OutFile) {
   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";

diff --git a/Driver/PrintPreprocessedOutput.cpp b/Driver/PrintPreprocessedOutput.cpp
index fd150ae3c7086711e088b21eda03beb13d6004de..923439c07071c084afb0c51488c7b03d3e376bcf 100644 (file)
--- a/Driver/PrintPreprocessedOutput.cpp
+++ b/Driver/PrintPreprocessedOutput.cpp
@@ -476,7 +476,7 @@ void clang::DoPrintPreprocessedInput(Preprocessor &PP,
   
   // 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);

diff --git a/Driver/RewriteMacros.cpp b/Driver/RewriteMacros.cpp
index 89310140813484778053584558cd8c4211bda4dc..d10bf55853f2f851f3bcfbf46c5d8fffa6fec2c1 100644 (file)
--- a/Driver/RewriteMacros.cpp
+++ b/Driver/RewriteMacros.cpp
@@ -212,7 +212,7 @@ void clang::RewriteMacrosInInput(Preprocessor &PP,const std::string &InFileName,
     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 @@ void clang::RewriteMacrosInInput(Preprocessor &PP,const std::string &InFileName,
     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);
   }
 

diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp
index 65e8841ec79340480d8ef00e7d4aeb507a0c3e55..6d673230fa8f5cd21abda2c5530ce87cae01080f 100644 (file)
--- a/Driver/RewriteObjC.cpp
+++ b/Driver/RewriteObjC.cpp
@@ -4107,7 +4107,7 @@ void RewriteObjC::HandleTranslationUnit(TranslationUnit& TU) {
     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 @@ void RewriteObjC::HandleTranslationUnit(TranslationUnit& TU) {
     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);
   }
   

diff --git a/Driver/SerializationTest.cpp b/Driver/SerializationTest.cpp
index 9f93479912c929da3bae2f478d351098e1eeaa79..e489a19ff83ff0c180dd642befd3d6a975fd88a2 100644 (file)
--- a/Driver/SerializationTest.cpp
+++ b/Driver/SerializationTest.cpp
@@ -65,7 +65,7 @@ bool SerializationTest::Serialize(llvm::sys::Path& Filename,
   { 
     // 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 @@ bool SerializationTest::Deserialize(llvm::sys::Path& Filename,
   {
     // 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));
     

diff --git a/lib/AST/InheritViz.cpp b/lib/AST/InheritViz.cpp
index 5e4dab4a5e39eb0741bce543b50003fdd96ef8d1..dd2fc14ab2a4cf5f8b617a63da760ca25e2f34b1 100644 (file)
--- a/lib/AST/InheritViz.cpp
+++ b/lib/AST/InheritViz.cpp
@@ -149,7 +149,7 @@ void CXXRecordDecl::viewInheritance(ASTContext& Context) const {
 
   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);

diff --git a/lib/Driver/PlistDiagnostics.cpp b/lib/Driver/PlistDiagnostics.cpp
index 500524157e57ec0698c74ee07206b91356a3406a..b9e35aa815b45e85b42ce1ebcbe5ad2f8fa9554b 100644 (file)
--- a/lib/Driver/PlistDiagnostics.cpp
+++ b/lib/Driver/PlistDiagnostics.cpp
@@ -195,7 +195,7 @@ void PlistDiagnostics::HandlePathDiagnostic(const PathDiagnostic* D) {
   
   // 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';