From ac69459e0fe3df04788f5adcb94b1bec8b8cf8ad Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 24 Feb 2014 18:20:12 +0000 Subject: Replace the F_Binary flag with a F_Text one. After this I will set the default back to F_None. The advantage is that before this patch forgetting to set F_Binary would corrupt a file on windows. Forgetting to set F_Text produces one that cannot be read in notepad, which is a better failure mode :-) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@202052 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/bugpoint/OptimizerDriver.cpp | 2 +- tools/llc/llc.cpp | 4 ++-- tools/lli/lli.cpp | 2 +- tools/llvm-ar/llvm-ar.cpp | 2 +- tools/llvm-as/llvm-as.cpp | 2 +- tools/llvm-dis/llvm-dis.cpp | 2 +- tools/llvm-extract/llvm-extract.cpp | 2 +- tools/llvm-link/llvm-link.cpp | 2 +- tools/llvm-lto/llvm-lto.cpp | 2 +- tools/llvm-mc/llvm-mc.cpp | 2 +- tools/llvm-objdump/llvm-objdump.cpp | 4 ++-- tools/llvm-profdata/llvm-profdata.cpp | 2 +- tools/llvm-stress/llvm-stress.cpp | 2 +- tools/opt/opt.cpp | 4 ++-- 14 files changed, 17 insertions(+), 17 deletions(-) (limited to 'tools') diff --git a/tools/bugpoint/OptimizerDriver.cpp b/tools/bugpoint/OptimizerDriver.cpp index 411b772af5..f91f493711 100644 --- a/tools/bugpoint/OptimizerDriver.cpp +++ b/tools/bugpoint/OptimizerDriver.cpp @@ -71,7 +71,7 @@ bool BugDriver::writeProgramToFile(const std::string &Filename, int FD, bool BugDriver::writeProgramToFile(const std::string &Filename, const Module *M) const { std::string ErrInfo; - tool_output_file Out(Filename.c_str(), ErrInfo, sys::fs::F_Binary); + tool_output_file Out(Filename.c_str(), ErrInfo, sys::fs::F_None); if (ErrInfo.empty()) return writeProgramToFileAux(Out, M); return true; diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp index f8f0283191..3c4336addb 100644 --- a/tools/llc/llc.cpp +++ b/tools/llc/llc.cpp @@ -150,8 +150,8 @@ static tool_output_file *GetOutputStream(const char *TargetName, // Open the file. std::string error; sys::fs::OpenFlags OpenFlags = sys::fs::F_None; - if (Binary) - OpenFlags |= sys::fs::F_Binary; + if (!Binary) + OpenFlags |= sys::fs::F_Text; tool_output_file *FDOut = new tool_output_file(OutputFilename.c_str(), error, OpenFlags); if (!error.empty()) { diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index 7e928bebff..448db84d1c 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -273,7 +273,7 @@ public: sys::path::remove_filename(dir); sys::fs::create_directories(Twine(dir)); } - raw_fd_ostream outfile(CacheName.c_str(), errStr, sys::fs::F_Binary); + raw_fd_ostream outfile(CacheName.c_str(), errStr, sys::fs::F_None); outfile.write(Obj->getBufferStart(), Obj->getBufferSize()); outfile.close(); } diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 64d45bcb09..7db4b8308e 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -322,7 +322,7 @@ static void doExtract(StringRef Name, object::Archive::child_iterator I) { int FD; failIfError( - sys::fs::openFileForWrite(Storage.c_str(), FD, sys::fs::F_Binary, Mode), + sys::fs::openFileForWrite(Storage.c_str(), FD, sys::fs::F_None, Mode), Storage.c_str()); { diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp index d13caf1955..a9a230536e 100644 --- a/tools/llvm-as/llvm-as.cpp +++ b/tools/llvm-as/llvm-as.cpp @@ -70,7 +70,7 @@ static void WriteOutputFile(const Module *M) { std::string ErrorInfo; OwningPtr Out(new tool_output_file( - OutputFilename.c_str(), ErrorInfo, sys::fs::F_Binary)); + OutputFilename.c_str(), ErrorInfo, sys::fs::F_None)); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; exit(1); diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp index 9fb056510c..f25b040a81 100644 --- a/tools/llvm-dis/llvm-dis.cpp +++ b/tools/llvm-dis/llvm-dis.cpp @@ -172,7 +172,7 @@ int main(int argc, char **argv) { std::string ErrorInfo; OwningPtr Out(new tool_output_file( - OutputFilename.c_str(), ErrorInfo, sys::fs::F_Binary)); + OutputFilename.c_str(), ErrorInfo, sys::fs::F_None)); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; return 1; diff --git a/tools/llvm-extract/llvm-extract.cpp b/tools/llvm-extract/llvm-extract.cpp index 639e8fc2d0..45c920ff3c 100644 --- a/tools/llvm-extract/llvm-extract.cpp +++ b/tools/llvm-extract/llvm-extract.cpp @@ -265,7 +265,7 @@ int main(int argc, char **argv) { Passes.add(createStripDeadPrototypesPass()); // Remove dead func decls std::string ErrorInfo; - tool_output_file Out(OutputFilename.c_str(), ErrorInfo, sys::fs::F_Binary); + tool_output_file Out(OutputFilename.c_str(), ErrorInfo, sys::fs::F_None); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; return 1; diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index 11870fa768..f1b32de04b 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -110,7 +110,7 @@ int main(int argc, char **argv) { if (DumpAsm) errs() << "Here's the assembly:\n" << *Composite; std::string ErrorInfo; - tool_output_file Out(OutputFilename.c_str(), ErrorInfo, sys::fs::F_Binary); + tool_output_file Out(OutputFilename.c_str(), ErrorInfo, sys::fs::F_None); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; return 1; diff --git a/tools/llvm-lto/llvm-lto.cpp b/tools/llvm-lto/llvm-lto.cpp index e12852981b..d984773cdd 100644 --- a/tools/llvm-lto/llvm-lto.cpp +++ b/tools/llvm-lto/llvm-lto.cpp @@ -142,7 +142,7 @@ int main(int argc, char **argv) { } raw_fd_ostream FileStream(OutputFilename.c_str(), ErrorInfo, - sys::fs::F_Binary); + sys::fs::F_None); if (!ErrorInfo.empty()) { errs() << argv[0] << ": error opening the file '" << OutputFilename << "': " << ErrorInfo << "\n"; diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp index 02e78a2707..9c7e76cd33 100644 --- a/tools/llvm-mc/llvm-mc.cpp +++ b/tools/llvm-mc/llvm-mc.cpp @@ -211,7 +211,7 @@ static tool_output_file *GetOutputStream() { std::string Err; tool_output_file *Out = - new tool_output_file(OutputFilename.c_str(), Err, sys::fs::F_Binary); + new tool_output_file(OutputFilename.c_str(), Err, sys::fs::F_None); if (!Err.empty()) { errs() << Err << '\n'; delete Out; diff --git a/tools/llvm-objdump/llvm-objdump.cpp b/tools/llvm-objdump/llvm-objdump.cpp index e090f688a4..8d934cf948 100644 --- a/tools/llvm-objdump/llvm-objdump.cpp +++ b/tools/llvm-objdump/llvm-objdump.cpp @@ -192,7 +192,7 @@ static void emitDOTFile(const char *FileName, const MCFunction &f, MCInstPrinter *IP) { // Start a new dot file. std::string Error; - raw_fd_ostream Out(FileName, Error, sys::fs::F_None); + raw_fd_ostream Out(FileName, Error, sys::fs::F_Text); if (!Error.empty()) { errs() << "llvm-objdump: warning: " << Error << '\n'; return; @@ -373,7 +373,7 @@ static void DisassembleObject(const ObjectFile *Obj, bool InlineRelocs) { } if (!YAMLCFG.empty()) { std::string Error; - raw_fd_ostream YAMLOut(YAMLCFG.c_str(), Error, sys::fs::F_None); + raw_fd_ostream YAMLOut(YAMLCFG.c_str(), Error, sys::fs::F_Text); if (!Error.empty()) { errs() << ToolName << ": warning: " << Error << '\n'; return; diff --git a/tools/llvm-profdata/llvm-profdata.cpp b/tools/llvm-profdata/llvm-profdata.cpp index b2f52b29dc..236780b485 100644 --- a/tools/llvm-profdata/llvm-profdata.cpp +++ b/tools/llvm-profdata/llvm-profdata.cpp @@ -112,7 +112,7 @@ int main(int argc, char **argv) { OutputFilename = "-"; std::string ErrorInfo; - raw_fd_ostream Output(OutputFilename.data(), ErrorInfo, sys::fs::F_None); + raw_fd_ostream Output(OutputFilename.data(), ErrorInfo, sys::fs::F_Text); if (!ErrorInfo.empty()) exitWithError(ErrorInfo, OutputFilename); diff --git a/tools/llvm-stress/llvm-stress.cpp b/tools/llvm-stress/llvm-stress.cpp index 1b6bdd1714..beb0a6042d 100644 --- a/tools/llvm-stress/llvm-stress.cpp +++ b/tools/llvm-stress/llvm-stress.cpp @@ -705,7 +705,7 @@ int main(int argc, char **argv) { std::string ErrorInfo; Out.reset(new tool_output_file(OutputFilename.c_str(), ErrorInfo, - sys::fs::F_Binary)); + sys::fs::F_None)); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; return 1; diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index b9d3f9d6d2..9ab43148da 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -381,7 +381,7 @@ int main(int argc, char **argv) { std::string ErrorInfo; Out.reset(new tool_output_file(OutputFilename.c_str(), ErrorInfo, - sys::fs::F_Binary)); + sys::fs::F_None)); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; return 1; @@ -467,7 +467,7 @@ int main(int argc, char **argv) { std::string ErrorInfo; Out.reset(new tool_output_file(OutputFilename.c_str(), ErrorInfo, - sys::fs::F_Binary)); + sys::fs::F_None)); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; return 1; -- cgit v1.2.3