From 2018c6b469782d55afc0eadf7e4c79307b164698 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 24 Feb 2014 18:20:21 +0000 Subject: [PATCH] Update for llvm api change. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@202053 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/ARCMigrate/FileRemapper.cpp | 6 ++---- lib/ARCMigrate/ObjCMT.cpp | 2 +- lib/ARCMigrate/PlistReporter.cpp | 2 +- lib/Driver/Compilation.cpp | 3 ++- lib/Driver/Driver.cpp | 3 +-- lib/Frontend/CompilerInstance.cpp | 12 ++++++------ lib/Frontend/DependencyFile.cpp | 2 +- lib/Frontend/DependencyGraph.cpp | 2 +- lib/Frontend/FrontendActions.cpp | 2 +- lib/Frontend/HeaderIncludeGen.cpp | 3 ++- lib/Rewrite/Frontend/FixItRewriter.cpp | 2 +- lib/Serialization/ASTReader.cpp | 2 +- lib/StaticAnalyzer/Core/PlistDiagnostics.cpp | 2 +- tools/driver/cc1as_main.cpp | 2 +- 14 files changed, 22 insertions(+), 23 deletions(-) diff --git a/lib/ARCMigrate/FileRemapper.cpp b/lib/ARCMigrate/FileRemapper.cpp index cabea6031c..a6c019bcae 100644 --- a/lib/ARCMigrate/FileRemapper.cpp +++ b/lib/ARCMigrate/FileRemapper.cpp @@ -123,8 +123,7 @@ bool FileRemapper::flushToFile(StringRef outputPath, DiagnosticsEngine &Diag) { std::string errMsg; std::string infoFile = outputPath; - llvm::raw_fd_ostream infoOut(infoFile.c_str(), errMsg, - llvm::sys::fs::F_Binary); + llvm::raw_fd_ostream infoOut(infoFile.c_str(), errMsg, llvm::sys::fs::F_None); if (!errMsg.empty()) return report(errMsg, Diag); @@ -180,8 +179,7 @@ bool FileRemapper::overwriteOriginal(DiagnosticsEngine &Diag, Diag); std::string errMsg; - llvm::raw_fd_ostream Out(origFE->getName(), errMsg, - llvm::sys::fs::F_Binary); + llvm::raw_fd_ostream Out(origFE->getName(), errMsg, llvm::sys::fs::F_None); if (!errMsg.empty()) return report(errMsg, Diag); diff --git a/lib/ARCMigrate/ObjCMT.cpp b/lib/ARCMigrate/ObjCMT.cpp index 19352c0107..a8010e1ab5 100644 --- a/lib/ARCMigrate/ObjCMT.cpp +++ b/lib/ARCMigrate/ObjCMT.cpp @@ -1843,7 +1843,7 @@ void ObjCMigrateASTConsumer::HandleTranslationUnit(ASTContext &Ctx) { if (IsOutputFile) { std::string Error; - llvm::raw_fd_ostream OS(MigrateDir.c_str(), Error, llvm::sys::fs::F_Binary); + llvm::raw_fd_ostream OS(MigrateDir.c_str(), Error, llvm::sys::fs::F_None); if (!Error.empty()) { DiagnosticsEngine &Diags = Ctx.getDiagnostics(); Diags.Report(Diags.getCustomDiagID(DiagnosticsEngine::Error, "%0")) diff --git a/lib/ARCMigrate/PlistReporter.cpp b/lib/ARCMigrate/PlistReporter.cpp index ed39f07263..263241761f 100644 --- a/lib/ARCMigrate/PlistReporter.cpp +++ b/lib/ARCMigrate/PlistReporter.cpp @@ -41,7 +41,7 @@ void arcmt::writeARCDiagsToPlist(const std::string &outPath, } std::string errMsg; - llvm::raw_fd_ostream o(outPath.c_str(), errMsg, llvm::sys::fs::F_None); + llvm::raw_fd_ostream o(outPath.c_str(), errMsg, llvm::sys::fs::F_Text); if (!errMsg.empty()) { llvm::errs() << "error: could not create file: " << outPath << '\n'; return; diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp index 66e5eaf894..a20a2bd2f7 100644 --- a/lib/Driver/Compilation.cpp +++ b/lib/Driver/Compilation.cpp @@ -135,7 +135,8 @@ int Compilation::ExecuteCommand(const Command &C, if (getDriver().CCPrintOptions && getDriver().CCPrintOptionsFilename) { std::string Error; OS = new llvm::raw_fd_ostream(getDriver().CCPrintOptionsFilename, Error, - llvm::sys::fs::F_Append); + llvm::sys::fs::F_Append | + llvm::sys::fs::F_Text); if (!Error.empty()) { getDriver().Diag(clang::diag::err_drv_cc_print_options_failure) << Error; diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index e2ff568ff3..8d1b4015f7 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -522,8 +522,7 @@ void Driver::generateCompilationDiagnostics(Compilation &C, std::string Err; std::string Script = StringRef(*it).rsplit('.').first; Script += ".sh"; - llvm::raw_fd_ostream ScriptOS( - Script.c_str(), Err, llvm::sys::fs::F_Excl | llvm::sys::fs::F_Binary); + llvm::raw_fd_ostream ScriptOS(Script.c_str(), Err, llvm::sys::fs::F_Excl); if (!Err.empty()) { Diag(clang::diag::note_drv_command_failed_diag_msg) << "Error generating run script: " + Script + " " + Err; diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index df0095205c..3fe8f0e82f 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -114,9 +114,9 @@ static void SetUpDiagnosticLog(DiagnosticOptions *DiagOpts, raw_ostream *OS = &llvm::errs(); if (DiagOpts->DiagnosticLogFile != "-") { // Create the output stream. - llvm::raw_fd_ostream *FileOS( - new llvm::raw_fd_ostream(DiagOpts->DiagnosticLogFile.c_str(), ErrorInfo, - llvm::sys::fs::F_Append)); + llvm::raw_fd_ostream *FileOS(new llvm::raw_fd_ostream( + DiagOpts->DiagnosticLogFile.c_str(), ErrorInfo, + llvm::sys::fs::F_Append | llvm::sys::fs::F_Text)); if (!ErrorInfo.empty()) { Diags.Report(diag::warn_fe_cc_log_diagnostics_failure) << DiagOpts->DiagnosticLogFile << ErrorInfo; @@ -142,7 +142,7 @@ static void SetupSerializedDiagnostics(DiagnosticOptions *DiagOpts, std::string ErrorInfo; OwningPtr OS; OS.reset(new llvm::raw_fd_ostream(OutputFile.str().c_str(), ErrorInfo, - llvm::sys::fs::F_Binary)); + llvm::sys::fs::F_None)); if (!ErrorInfo.empty()) { Diags.Report(diag::warn_fe_serialized_diag_failure) @@ -582,7 +582,7 @@ CompilerInstance::createOutputFile(StringRef OutputPath, OSFile = OutFile; OS.reset(new llvm::raw_fd_ostream( OSFile.c_str(), Error, - (Binary ? llvm::sys::fs::F_Binary : llvm::sys::fs::F_None))); + (Binary ? llvm::sys::fs::F_None : llvm::sys::fs::F_Text))); if (!Error.empty()) return 0; } @@ -1022,7 +1022,7 @@ static void checkConfigMacro(Preprocessor &PP, StringRef ConfigMacro, static void writeTimestampFile(StringRef TimestampFile) { std::string ErrorInfo; llvm::raw_fd_ostream Out(TimestampFile.str().c_str(), ErrorInfo, - llvm::sys::fs::F_Binary); + llvm::sys::fs::F_None); } /// \brief Prune the module cache of modules that haven't been accessed in diff --git a/lib/Frontend/DependencyFile.cpp b/lib/Frontend/DependencyFile.cpp index 0aa1a05eff..39ccdd736c 100644 --- a/lib/Frontend/DependencyFile.cpp +++ b/lib/Frontend/DependencyFile.cpp @@ -171,7 +171,7 @@ void DependencyFileCallback::OutputDependencyFile() { } std::string Err; - llvm::raw_fd_ostream OS(OutputFile.c_str(), Err, llvm::sys::fs::F_None); + llvm::raw_fd_ostream OS(OutputFile.c_str(), Err, llvm::sys::fs::F_Text); if (!Err.empty()) { PP->getDiagnostics().Report(diag::err_fe_error_opening) << OutputFile << Err; diff --git a/lib/Frontend/DependencyGraph.cpp b/lib/Frontend/DependencyGraph.cpp index a45d978e30..6f12e63056 100644 --- a/lib/Frontend/DependencyGraph.cpp +++ b/lib/Frontend/DependencyGraph.cpp @@ -101,7 +101,7 @@ DependencyGraphCallback::writeNodeReference(raw_ostream &OS, void DependencyGraphCallback::OutputGraphFile() { std::string Err; - llvm::raw_fd_ostream OS(OutputFile.c_str(), Err, llvm::sys::fs::F_None); + llvm::raw_fd_ostream OS(OutputFile.c_str(), Err, llvm::sys::fs::F_Text); if (!Err.empty()) { PP->getDiagnostics().Report(diag::err_fe_error_opening) << OutputFile << Err; diff --git a/lib/Frontend/FrontendActions.cpp b/lib/Frontend/FrontendActions.cpp index d3a738fff7..eda21c5f3f 100644 --- a/lib/Frontend/FrontendActions.cpp +++ b/lib/Frontend/FrontendActions.cpp @@ -451,7 +451,7 @@ void DumpModuleInfoAction::ExecuteAction() { if (!OutputFileName.empty() && OutputFileName != "-") { std::string ErrorInfo; OutFile.reset(new llvm::raw_fd_ostream(OutputFileName.str().c_str(), - ErrorInfo, llvm::sys::fs::F_None)); + ErrorInfo, llvm::sys::fs::F_Text)); } llvm::raw_ostream &Out = OutFile.get()? *OutFile.get() : llvm::outs(); diff --git a/lib/Frontend/HeaderIncludeGen.cpp b/lib/Frontend/HeaderIncludeGen.cpp index 237e5b1ac0..00ff63746c 100644 --- a/lib/Frontend/HeaderIncludeGen.cpp +++ b/lib/Frontend/HeaderIncludeGen.cpp @@ -56,7 +56,8 @@ void clang::AttachHeaderIncludeGen(Preprocessor &PP, bool ShowAllHeaders, if (!OutputPath.empty()) { std::string Error; llvm::raw_fd_ostream *OS = new llvm::raw_fd_ostream( - OutputPath.str().c_str(), Error, llvm::sys::fs::F_Append); + OutputPath.str().c_str(), Error, + llvm::sys::fs::F_Append | llvm::sys::fs::F_Text); if (!Error.empty()) { PP.getDiagnostics().Report( clang::diag::warn_fe_cc_print_header_failure) << Error; diff --git a/lib/Rewrite/Frontend/FixItRewriter.cpp b/lib/Rewrite/Frontend/FixItRewriter.cpp index 8930c35d06..906bc84169 100644 --- a/lib/Rewrite/Frontend/FixItRewriter.cpp +++ b/lib/Rewrite/Frontend/FixItRewriter.cpp @@ -92,7 +92,7 @@ bool FixItRewriter::WriteFixedFiles( OS.reset(new llvm::raw_fd_ostream(fd, /*shouldClose=*/true)); } else { OS.reset(new llvm::raw_fd_ostream(Filename.c_str(), Err, - llvm::sys::fs::F_Binary)); + llvm::sys::fs::F_None)); } if (!Err.empty()) { Diags.Report(clang::diag::err_fe_unable_to_open_output) diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp index 4df694abe6..f93a52d7fd 100644 --- a/lib/Serialization/ASTReader.cpp +++ b/lib/Serialization/ASTReader.cpp @@ -2941,7 +2941,7 @@ static void updateModuleTimestamp(ModuleFile &MF) { std::string TimestampFilename = MF.getTimestampFilename(); std::string ErrorInfo; llvm::raw_fd_ostream OS(TimestampFilename.c_str(), ErrorInfo, - llvm::sys::fs::F_None); + llvm::sys::fs::F_Text); if (!ErrorInfo.empty()) return; OS << "Timestamp file\n"; diff --git a/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp b/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp index bd8a2338e2..0dcc69d1bc 100644 --- a/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp +++ b/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp @@ -337,7 +337,7 @@ void PlistDiagnostics::FlushDiagnosticsImpl( // Open the file. std::string ErrMsg; - llvm::raw_fd_ostream o(OutputFile.c_str(), ErrMsg, llvm::sys::fs::F_None); + llvm::raw_fd_ostream o(OutputFile.c_str(), ErrMsg, llvm::sys::fs::F_Text); if (!ErrMsg.empty()) { llvm::errs() << "warning: could not create file: " << OutputFile << '\n'; return; diff --git a/tools/driver/cc1as_main.cpp b/tools/driver/cc1as_main.cpp index 177d8e550b..d5b61117eb 100644 --- a/tools/driver/cc1as_main.cpp +++ b/tools/driver/cc1as_main.cpp @@ -251,7 +251,7 @@ static formatted_raw_ostream *GetOutputStream(AssemblerInvocation &Opts, std::string Error; raw_fd_ostream *Out = new raw_fd_ostream(Opts.OutputPath.c_str(), Error, - (Binary ? sys::fs::F_Binary : sys::fs::F_None)); + (Binary ? sys::fs::F_None : sys::fs::F_Text)); if (!Error.empty()) { Diags.Report(diag::err_fe_unable_to_open_output) << Opts.OutputPath << Error; -- 2.40.0