From 3f0b170fddc538cd65eab35a60814f7d229004fd Mon Sep 17 00:00:00 2001 From: Abhina Sreeskantharajan Date: Tue, 6 Apr 2021 07:22:41 -0400 Subject: [PATCH] [SystemZ][z/OS][Windows] Add new OF_TextWithCRLF flag and use this flag instead of OF_Text Problem: On SystemZ we need to open text files in text mode. On Windows, files opened in text mode adds a CRLF '\r\n' which may not be desirable. Solution: This patch adds two new flags - OF_CRLF which indicates that CRLF translation is used. - OF_TextWithCRLF = OF_Text | OF_CRLF indicates that the file is text and uses CRLF translation. Developers should now use either the OF_Text or OF_TextWithCRLF for text files and OF_None for binary files. If the developer doesn't want carriage returns on Windows, they should use OF_Text, if they do want carriage returns on Windows, they should use OF_TextWithCRLF. So this is the behaviour per platform with my patch: z/OS: OF_None: open in binary mode OF_Text : open in text mode OF_TextWithCRLF: open in text mode Windows: OF_None: open file with no carriage return OF_Text: open file with no carriage return OF_TextWithCRLF: open file with carriage return The Major change is in llvm/lib/Support/Windows/Path.inc to only set text mode if the OF_CRLF is set. ``` if (Flags & OF_CRLF) CrtOpenFlags |= _O_TEXT; ``` These following files are the ones that still use OF_Text which I left unchanged. I modified all these except raw_ostream.cpp in recent patches so I know these were previously in Binary mode on Windows. ./llvm/lib/Support/raw_ostream.cpp ./llvm/lib/TableGen/Main.cpp ./llvm/tools/dsymutil/DwarfLinkerForBinary.cpp ./llvm/unittests/Support/Path.cpp ./clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp ./clang/lib/Frontend/CompilerInstance.cpp ./clang/lib/Driver/Driver.cpp ./clang/lib/Driver/ToolChains/Clang.cpp Reviewed By: MaskRay Differential Revision: https://reviews.llvm.org/D99426 --- include/llvm/Analysis/DOTGraphTraitsPass.h | 4 +-- include/llvm/Support/FileSystem.h | 26 +++++++++++++------ lib/CodeGen/RegAllocPBQP.cpp | 2 +- lib/IR/Core.cpp | 2 +- lib/IR/LLVMRemarkStreamer.cpp | 2 +- lib/LTO/LTOBackend.cpp | 5 ++-- lib/MC/MCParser/DarwinAsmParser.cpp | 5 ++-- lib/ProfileData/GCOV.cpp | 4 +-- lib/ProfileData/SampleProfWriter.cpp | 2 +- lib/Support/FileCollector.cpp | 2 +- lib/Support/MemoryBuffer.cpp | 2 +- lib/Support/TimeProfiler.cpp | 2 +- lib/Support/Timer.cpp | 2 +- lib/Support/Unix/Program.inc | 2 +- lib/Support/Windows/Path.inc | 4 ++- lib/Support/Windows/Program.inc | 2 +- lib/Transforms/IPO/Attributor.cpp | 2 +- lib/Transforms/IPO/LowerTypeTests.cpp | 2 +- lib/Transforms/IPO/WholeProgramDevirt.cpp | 2 +- lib/Transforms/Utils/Debugify.cpp | 2 +- tools/dsymutil/dsymutil.cpp | 2 +- tools/llc/llc.cpp | 2 +- tools/lli/lli.cpp | 3 ++- tools/llvm-cxxmap/llvm-cxxmap.cpp | 2 +- tools/llvm-dis/llvm-dis.cpp | 2 +- tools/llvm-dwarfdump/llvm-dwarfdump.cpp | 2 +- tools/llvm-exegesis/lib/BenchmarkResult.cpp | 5 ++-- tools/llvm-link/llvm-link.cpp | 3 ++- tools/llvm-mc/llvm-mc.cpp | 5 ++-- tools/llvm-mca/llvm-mca.cpp | 4 +-- tools/llvm-opt-report/OptReport.cpp | 2 +- tools/llvm-profdata/llvm-profdata.cpp | 6 ++--- tools/llvm-xray/xray-account.cpp | 2 +- tools/llvm-xray/xray-converter.cpp | 2 +- tools/llvm-xray/xray-extract.cpp | 2 +- tools/llvm-xray/xray-graph-diff.cpp | 2 +- tools/llvm-xray/xray-graph.cpp | 2 +- tools/opt/opt.cpp | 4 +-- .../verify-uselistorder.cpp | 2 +- unittests/Support/Path.cpp | 2 +- 40 files changed, 75 insertions(+), 57 deletions(-) diff --git a/include/llvm/Analysis/DOTGraphTraitsPass.h b/include/llvm/Analysis/DOTGraphTraitsPass.h index ecf54cd8a68..59737744f57 100644 --- a/include/llvm/Analysis/DOTGraphTraitsPass.h +++ b/include/llvm/Analysis/DOTGraphTraitsPass.h @@ -97,7 +97,7 @@ public: errs() << "Writing '" << Filename << "'..."; - raw_fd_ostream File(Filename, EC, sys::fs::OF_Text); + raw_fd_ostream File(Filename, EC, sys::fs::OF_TextWithCRLF); std::string GraphName = DOTGraphTraits::getGraphName(Graph); std::string Title = GraphName + " for '" + F.getName().str() + "' function"; @@ -160,7 +160,7 @@ public: errs() << "Writing '" << Filename << "'..."; - raw_fd_ostream File(Filename, EC, sys::fs::OF_Text); + raw_fd_ostream File(Filename, EC, sys::fs::OF_TextWithCRLF); std::string Title = DOTGraphTraits::getGraphName(Graph); if (!EC) diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h index 1dc88243e83..2ed7d87690c 100644 --- a/include/llvm/Support/FileSystem.h +++ b/include/llvm/Support/FileSystem.h @@ -742,24 +742,34 @@ enum OpenFlags : unsigned { OF_None = 0, F_None = 0, // For compatibility - /// The file should be opened in text mode on platforms that make this - /// distinction. + /// The file should be opened in text mode on platforms like z/OS that make + /// this distinction. OF_Text = 1, F_Text = 1, // For compatibility + /// The file should use a carriage linefeed '\r\n'. This flag should only be + /// used with OF_Text. Only makes a difference on Windows. + OF_CRLF = 2, + + /// The file should be opened in text mode and use a carriage linefeed '\r\n'. + /// This flag has the same functionality as OF_Text on z/OS but adds a + /// carriage linefeed on Windows. + OF_TextWithCRLF = OF_Text | OF_CRLF, + /// The file should be opened in append mode. - OF_Append = 2, - F_Append = 2, // For compatibility + OF_Append = 4, + F_Append = 4, // For compatibility /// Delete the file on close. Only makes a difference on windows. - OF_Delete = 4, + OF_Delete = 8, /// When a child process is launched, this file should remain open in the /// child process. - OF_ChildInherit = 8, + OF_ChildInherit = 16, - /// Force files Atime to be updated on access. Only makes a difference on windows. - OF_UpdateAtime = 16, + /// Force files Atime to be updated on access. Only makes a difference on + /// Windows. + OF_UpdateAtime = 32, }; /// Create a potentially unique file name but does not create it. diff --git a/lib/CodeGen/RegAllocPBQP.cpp b/lib/CodeGen/RegAllocPBQP.cpp index 763505c04fb..b22eb080791 100644 --- a/lib/CodeGen/RegAllocPBQP.cpp +++ b/lib/CodeGen/RegAllocPBQP.cpp @@ -859,7 +859,7 @@ bool RegAllocPBQP::runOnMachineFunction(MachineFunction &MF) { std::string GraphFileName = FullyQualifiedName + "." + RS.str() + ".pbqpgraph"; std::error_code EC; - raw_fd_ostream OS(GraphFileName, EC, sys::fs::OF_Text); + raw_fd_ostream OS(GraphFileName, EC, sys::fs::OF_TextWithCRLF); LLVM_DEBUG(dbgs() << "Dumping graph for round " << Round << " to \"" << GraphFileName << "\"\n"); G.dump(OS); diff --git a/lib/IR/Core.cpp b/lib/IR/Core.cpp index 2d93d50b889..d597a69dbd5 100644 --- a/lib/IR/Core.cpp +++ b/lib/IR/Core.cpp @@ -412,7 +412,7 @@ void LLVMDumpModule(LLVMModuleRef M) { LLVMBool LLVMPrintModuleToFile(LLVMModuleRef M, const char *Filename, char **ErrorMessage) { std::error_code EC; - raw_fd_ostream dest(Filename, EC, sys::fs::OF_Text); + raw_fd_ostream dest(Filename, EC, sys::fs::OF_TextWithCRLF); if (EC) { *ErrorMessage = strdup(EC.message().c_str()); return true; diff --git a/lib/IR/LLVMRemarkStreamer.cpp b/lib/IR/LLVMRemarkStreamer.cpp index 18b47611c97..21ce47457f5 100644 --- a/lib/IR/LLVMRemarkStreamer.cpp +++ b/lib/IR/LLVMRemarkStreamer.cpp @@ -106,7 +106,7 @@ Expected> llvm::setupLLVMOptimizationRemarks( return make_error(std::move(E)); std::error_code EC; - auto Flags = *Format == remarks::Format::YAML ? sys::fs::OF_Text + auto Flags = *Format == remarks::Format::YAML ? sys::fs::OF_TextWithCRLF : sys::fs::OF_None; auto RemarksFile = std::make_unique(RemarksFilename, EC, Flags); diff --git a/lib/LTO/LTOBackend.cpp b/lib/LTO/LTOBackend.cpp index 34d1c9317e0..8a03a4fa89a 100644 --- a/lib/LTO/LTOBackend.cpp +++ b/lib/LTO/LTOBackend.cpp @@ -85,8 +85,9 @@ Error Config::addSaveTemps(std::string OutputFileName, ShouldDiscardValueNames = false; std::error_code EC; - ResolutionFile = std::make_unique( - OutputFileName + "resolution.txt", EC, sys::fs::OpenFlags::OF_Text); + ResolutionFile = + std::make_unique(OutputFileName + "resolution.txt", EC, + sys::fs::OpenFlags::OF_TextWithCRLF); if (EC) { ResolutionFile.reset(); return errorCodeToError(EC); diff --git a/lib/MC/MCParser/DarwinAsmParser.cpp b/lib/MC/MCParser/DarwinAsmParser.cpp index f56013869a6..26c814d0ab0 100644 --- a/lib/MC/MCParser/DarwinAsmParser.cpp +++ b/lib/MC/MCParser/DarwinAsmParser.cpp @@ -776,8 +776,9 @@ bool DarwinAsmParser::parseDirectiveSecureLogUnique(StringRef, SMLoc IDLoc) { raw_fd_ostream *OS = getContext().getSecureLog(); if (!OS) { std::error_code EC; - auto NewOS = std::make_unique( - StringRef(SecureLogFile), EC, sys::fs::OF_Append | sys::fs::OF_Text); + auto NewOS = std::make_unique(StringRef(SecureLogFile), EC, + sys::fs::OF_Append | + sys::fs::OF_TextWithCRLF); if (EC) return Error(IDLoc, Twine("can't open secure log file: ") + SecureLogFile + " (" + EC.message() + ")"); diff --git a/lib/ProfileData/GCOV.cpp b/lib/ProfileData/GCOV.cpp index f24c4b0cf9b..9978af061cd 100644 --- a/lib/ProfileData/GCOV.cpp +++ b/lib/ProfileData/GCOV.cpp @@ -866,7 +866,7 @@ void Context::print(StringRef filename, StringRef gcno, StringRef gcda, Optional os; if (!options.UseStdout) { std::error_code ec; - os.emplace(gcovName, ec, sys::fs::OF_Text); + os.emplace(gcovName, ec, sys::fs::OF_TextWithCRLF); if (ec) { errs() << ec.message() << '\n'; continue; @@ -881,7 +881,7 @@ void Context::print(StringRef filename, StringRef gcno, StringRef gcda, // (PR GCC/82702). We create just one file. std::string outputPath(sys::path::filename(filename)); std::error_code ec; - raw_fd_ostream os(outputPath + ".gcov", ec, sys::fs::OF_Text); + raw_fd_ostream os(outputPath + ".gcov", ec, sys::fs::OF_TextWithCRLF); if (ec) { errs() << ec.message() << '\n'; return; diff --git a/lib/ProfileData/SampleProfWriter.cpp b/lib/ProfileData/SampleProfWriter.cpp index b9643480a8e..d32fcbf7912 100644 --- a/lib/ProfileData/SampleProfWriter.cpp +++ b/lib/ProfileData/SampleProfWriter.cpp @@ -728,7 +728,7 @@ SampleProfileWriter::create(StringRef Filename, SampleProfileFormat Format) { Format == SPF_Compact_Binary) OS.reset(new raw_fd_ostream(Filename, EC, sys::fs::OF_None)); else - OS.reset(new raw_fd_ostream(Filename, EC, sys::fs::OF_Text)); + OS.reset(new raw_fd_ostream(Filename, EC, sys::fs::OF_TextWithCRLF)); if (EC) return EC; diff --git a/lib/Support/FileCollector.cpp b/lib/Support/FileCollector.cpp index 7d23d036fac..5854baeebbb 100644 --- a/lib/Support/FileCollector.cpp +++ b/lib/Support/FileCollector.cpp @@ -241,7 +241,7 @@ std::error_code FileCollector::writeMapping(StringRef MappingFile) { VFSWriter.setUseExternalNames(false); std::error_code EC; - raw_fd_ostream os(MappingFile, EC, sys::fs::OF_Text); + raw_fd_ostream os(MappingFile, EC, sys::fs::OF_TextWithCRLF); if (EC) return EC; diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp index 1d75f0be1ca..dbdf41f255e 100644 --- a/lib/Support/MemoryBuffer.cpp +++ b/lib/Support/MemoryBuffer.cpp @@ -259,7 +259,7 @@ static ErrorOr> getFileAux(const Twine &Filename, uint64_t MapSize, uint64_t Offset, bool IsText, bool RequiresNullTerminator, bool IsVolatile) { Expected FDOrErr = sys::fs::openNativeFileForRead( - Filename, IsText ? sys::fs::OF_Text : sys::fs::OF_None); + Filename, IsText ? sys::fs::OF_TextWithCRLF : sys::fs::OF_None); if (!FDOrErr) return errorToErrorCode(FDOrErr.takeError()); sys::fs::file_t FD = *FDOrErr; diff --git a/lib/Support/TimeProfiler.cpp b/lib/Support/TimeProfiler.cpp index 93bf6f57e34..c37c74c61f3 100644 --- a/lib/Support/TimeProfiler.cpp +++ b/lib/Support/TimeProfiler.cpp @@ -304,7 +304,7 @@ Error llvm::timeTraceProfilerWrite(StringRef PreferredFileName, } std::error_code EC; - raw_fd_ostream OS(Path, EC, sys::fs::OF_Text); + raw_fd_ostream OS(Path, EC, sys::fs::OF_TextWithCRLF); if (EC) return createStringError(EC, "Could not open " + Path); diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp index a959cf35ec2..6e592dbc0ba 100644 --- a/lib/Support/Timer.cpp +++ b/lib/Support/Timer.cpp @@ -82,7 +82,7 @@ std::unique_ptr llvm::CreateInfoOutputFile() { // info output file before running commands which write to it. std::error_code EC; auto Result = std::make_unique( - OutputFilename, EC, sys::fs::OF_Append | sys::fs::OF_Text); + OutputFilename, EC, sys::fs::OF_Append | sys::fs::OF_TextWithCRLF); if (!EC) return Result; diff --git a/lib/Support/Unix/Program.inc b/lib/Support/Unix/Program.inc index 679ba536c99..3f18d89fbde 100644 --- a/lib/Support/Unix/Program.inc +++ b/lib/Support/Unix/Program.inc @@ -507,7 +507,7 @@ std::error_code llvm::sys::writeFileWithEncoding(StringRef FileName, StringRef Contents, WindowsEncodingMethod Encoding /*unused*/) { std::error_code EC; - llvm::raw_fd_ostream OS(FileName, EC, llvm::sys::fs::OpenFlags::OF_Text); + llvm::raw_fd_ostream OS(FileName, EC, llvm::sys::fs::OpenFlags::OF_TextWithCRLF); if (EC) return EC; diff --git a/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc index e2bd7da4f04..4a6d4a4cd1b 100644 --- a/lib/Support/Windows/Path.inc +++ b/lib/Support/Windows/Path.inc @@ -1083,8 +1083,10 @@ static std::error_code nativeFileToFd(Expected H, int &ResultFD, if (Flags & OF_Append) CrtOpenFlags |= _O_APPEND; - if (Flags & OF_Text) + if (Flags & OF_CRLF) { + assert(Flags & OF_Text && "Flags set OF_CRLF without OF_Text"); CrtOpenFlags |= _O_TEXT; + } ResultFD = -1; if (!H) diff --git a/lib/Support/Windows/Program.inc b/lib/Support/Windows/Program.inc index 687109c0135..92a607180c3 100644 --- a/lib/Support/Windows/Program.inc +++ b/lib/Support/Windows/Program.inc @@ -506,7 +506,7 @@ std::error_code llvm::sys::writeFileWithEncoding(StringRef FileName, StringRef Contents, WindowsEncodingMethod Encoding) { std::error_code EC; - llvm::raw_fd_ostream OS(FileName, EC, llvm::sys::fs::OF_Text); + llvm::raw_fd_ostream OS(FileName, EC, llvm::sys::fs::OF_TextWithCRLF); if (EC) return EC; diff --git a/lib/Transforms/IPO/Attributor.cpp b/lib/Transforms/IPO/Attributor.cpp index eef780d2970..0223ff97ac9 100644 --- a/lib/Transforms/IPO/Attributor.cpp +++ b/lib/Transforms/IPO/Attributor.cpp @@ -2413,7 +2413,7 @@ void AADepGraph::dumpGraph() { std::error_code EC; - raw_fd_ostream File(Filename, EC, sys::fs::OF_Text); + raw_fd_ostream File(Filename, EC, sys::fs::OF_TextWithCRLF); if (!EC) llvm::WriteGraph(File, this); diff --git a/lib/Transforms/IPO/LowerTypeTests.cpp b/lib/Transforms/IPO/LowerTypeTests.cpp index 804d1065a5e..9204bec3823 100644 --- a/lib/Transforms/IPO/LowerTypeTests.cpp +++ b/lib/Transforms/IPO/LowerTypeTests.cpp @@ -1722,7 +1722,7 @@ bool LowerTypeTestsModule::runForTesting(Module &M) { ExitOnError ExitOnErr("-lowertypetests-write-summary: " + ClWriteSummary + ": "); std::error_code EC; - raw_fd_ostream OS(ClWriteSummary, EC, sys::fs::OF_Text); + raw_fd_ostream OS(ClWriteSummary, EC, sys::fs::OF_TextWithCRLF); ExitOnErr(errorCodeToError(EC)); yaml::Output Out(OS); diff --git a/lib/Transforms/IPO/WholeProgramDevirt.cpp b/lib/Transforms/IPO/WholeProgramDevirt.cpp index 6fe3116f6fc..ee79bb2a310 100644 --- a/lib/Transforms/IPO/WholeProgramDevirt.cpp +++ b/lib/Transforms/IPO/WholeProgramDevirt.cpp @@ -918,7 +918,7 @@ bool DevirtModule::runForTesting( ExitOnErr(errorCodeToError(EC)); WriteIndexToFile(*Summary, OS); } else { - raw_fd_ostream OS(ClWriteSummary, EC, sys::fs::OF_Text); + raw_fd_ostream OS(ClWriteSummary, EC, sys::fs::OF_TextWithCRLF); ExitOnErr(errorCodeToError(EC)); yaml::Output Out(OS); Out << *Summary; diff --git a/lib/Transforms/Utils/Debugify.cpp b/lib/Transforms/Utils/Debugify.cpp index 73a3a4063f6..a9c07c29739 100644 --- a/lib/Transforms/Utils/Debugify.cpp +++ b/lib/Transforms/Utils/Debugify.cpp @@ -440,7 +440,7 @@ static void writeJSON(StringRef OrigDIVerifyBugsReportFilePath, llvm::json::Array &Bugs) { std::error_code EC; raw_fd_ostream OS_FILE{OrigDIVerifyBugsReportFilePath, EC, - sys::fs::OF_Append | sys::fs::OF_Text}; + sys::fs::OF_Append | sys::fs::OF_TextWithCRLF}; if (EC) { errs() << "Could not open file: " << EC.message() << ", " << OrigDIVerifyBugsReportFilePath << '\n'; diff --git a/tools/dsymutil/dsymutil.cpp b/tools/dsymutil/dsymutil.cpp index 347b2dd9166..27681fae3ca 100644 --- a/tools/dsymutil/dsymutil.cpp +++ b/tools/dsymutil/dsymutil.cpp @@ -312,7 +312,7 @@ static Error createPlistFile(StringRef Bin, StringRef BundleRoot, SmallString<128> InfoPlist(BundleRoot); sys::path::append(InfoPlist, "Contents/Info.plist"); std::error_code EC; - raw_fd_ostream PL(InfoPlist, EC, sys::fs::OF_Text); + raw_fd_ostream PL(InfoPlist, EC, sys::fs::OF_TextWithCRLF); if (EC) return make_error( "cannot create Plist: " + toString(errorCodeToError(EC)), EC); diff --git a/tools/llc/llc.cpp b/tools/llc/llc.cpp index 2e8865a98b4..f685fb8aa3e 100644 --- a/tools/llc/llc.cpp +++ b/tools/llc/llc.cpp @@ -276,7 +276,7 @@ static std::unique_ptr GetOutputStream(const char *TargetName, std::error_code EC; sys::fs::OpenFlags OpenFlags = sys::fs::OF_None; if (!Binary) - OpenFlags |= sys::fs::OF_Text; + OpenFlags |= sys::fs::OF_TextWithCRLF; auto FDOut = std::make_unique(OutputFilename, EC, OpenFlags); if (EC) { reportError(EC.message()); diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp index ced1e2a6d62..a15b0ddc512 100644 --- a/tools/lli/lli.cpp +++ b/tools/lli/lli.cpp @@ -791,7 +791,8 @@ static std::function createDebugDumper() { case DumpKind::DumpModsToDisk: return [](Module &M) { std::error_code EC; - raw_fd_ostream Out(M.getModuleIdentifier() + ".ll", EC, sys::fs::OF_Text); + raw_fd_ostream Out(M.getModuleIdentifier() + ".ll", EC, + sys::fs::OF_TextWithCRLF); if (EC) { errs() << "Couldn't open " << M.getModuleIdentifier() << " for dumping.\nError:" << EC.message() << "\n"; diff --git a/tools/llvm-cxxmap/llvm-cxxmap.cpp b/tools/llvm-cxxmap/llvm-cxxmap.cpp index b53a6364c89..f87c0169e75 100644 --- a/tools/llvm-cxxmap/llvm-cxxmap.cpp +++ b/tools/llvm-cxxmap/llvm-cxxmap.cpp @@ -145,7 +145,7 @@ int main(int argc, const char *argv[]) { exitWithErrorCode(RemappingBufOrError.getError(), RemappingFile); std::error_code EC; - raw_fd_ostream OS(OutputFilename.data(), EC, sys::fs::OF_Text); + raw_fd_ostream OS(OutputFilename.data(), EC, sys::fs::OF_TextWithCRLF); if (EC) exitWithErrorCode(EC, OutputFilename); diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp index 5d609468a38..2dcdbf0cf29 100644 --- a/tools/llvm-dis/llvm-dis.cpp +++ b/tools/llvm-dis/llvm-dis.cpp @@ -203,7 +203,7 @@ int main(int argc, char **argv) { std::error_code EC; std::unique_ptr Out( - new ToolOutputFile(FinalFilename, EC, sys::fs::OF_Text)); + new ToolOutputFile(FinalFilename, EC, sys::fs::OF_TextWithCRLF)); if (EC) { errs() << EC.message() << '\n'; return 1; diff --git a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp index 4322f125a84..642e452ce0e 100644 --- a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp +++ b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp @@ -628,7 +628,7 @@ int main(int argc, char **argv) { } std::error_code EC; - ToolOutputFile OutputFile(OutputFilename, EC, sys::fs::OF_Text); + ToolOutputFile OutputFile(OutputFilename, EC, sys::fs::OF_TextWithCRLF); error("Unable to open output file" + OutputFilename, EC); // Don't remove output file if we exit with an error. OutputFile.keep(); diff --git a/tools/llvm-exegesis/lib/BenchmarkResult.cpp b/tools/llvm-exegesis/lib/BenchmarkResult.cpp index 819a062e9b6..d86ab475cb9 100644 --- a/tools/llvm-exegesis/lib/BenchmarkResult.cpp +++ b/tools/llvm-exegesis/lib/BenchmarkResult.cpp @@ -401,8 +401,9 @@ Error InstructionBenchmark::writeYaml(const LLVMState &State, return Err; } else { int ResultFD = 0; - if (auto E = errorCodeToError(openFileForWrite( - Filename, ResultFD, sys::fs::CD_CreateAlways, sys::fs::OF_Text))) { + if (auto E = errorCodeToError(openFileForWrite(Filename, ResultFD, + sys::fs::CD_CreateAlways, + sys::fs::OF_TextWithCRLF))) { return E; } raw_fd_ostream Ostr(ResultFD, true /*shouldClose*/); diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index 846532ec6df..dde82382384 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -468,7 +468,8 @@ int main(int argc, char **argv) { std::error_code EC; ToolOutputFile Out(OutputFilename, EC, - OutputAssembly ? sys::fs::OF_Text : sys::fs::OF_None); + OutputAssembly ? sys::fs::OF_TextWithCRLF + : sys::fs::OF_None); if (EC) { WithColor::error() << EC.message() << '\n'; return 1; diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp index 5c88428f436..017d6a4e89a 100644 --- a/tools/llvm-mc/llvm-mc.cpp +++ b/tools/llvm-mc/llvm-mc.cpp @@ -452,8 +452,9 @@ int main(int argc, char **argv) { FeaturesStr = Features.getString(); } - sys::fs::OpenFlags Flags = (FileType == OFT_AssemblyFile) ? sys::fs::OF_Text - : sys::fs::OF_None; + sys::fs::OpenFlags Flags = (FileType == OFT_AssemblyFile) + ? sys::fs::OF_TextWithCRLF + : sys::fs::OF_None; std::unique_ptr Out = GetOutputStream(OutputFilename, Flags); if (!Out) return 1; diff --git a/tools/llvm-mca/llvm-mca.cpp b/tools/llvm-mca/llvm-mca.cpp index 0e0a39883f9..53c582af477 100644 --- a/tools/llvm-mca/llvm-mca.cpp +++ b/tools/llvm-mca/llvm-mca.cpp @@ -244,8 +244,8 @@ ErrorOr> getOutputStream() { if (OutputFilename == "") OutputFilename = "-"; std::error_code EC; - auto Out = - std::make_unique(OutputFilename, EC, sys::fs::OF_Text); + auto Out = std::make_unique(OutputFilename, EC, + sys::fs::OF_TextWithCRLF); if (!EC) return std::move(Out); return EC; diff --git a/tools/llvm-opt-report/OptReport.cpp b/tools/llvm-opt-report/OptReport.cpp index 8d7ecfb2d01..c47212de883 100644 --- a/tools/llvm-opt-report/OptReport.cpp +++ b/tools/llvm-opt-report/OptReport.cpp @@ -247,7 +247,7 @@ static bool readLocationInfo(LocationInfoTy &LocationInfo) { static bool writeReport(LocationInfoTy &LocationInfo) { std::error_code EC; - llvm::raw_fd_ostream OS(OutputFileName, EC, llvm::sys::fs::OF_Text); + llvm::raw_fd_ostream OS(OutputFileName, EC, llvm::sys::fs::OF_TextWithCRLF); if (EC) { WithColor::error() << "Can't open file " << OutputFileName << ": " << EC.message() << "\n"; diff --git a/tools/llvm-profdata/llvm-profdata.cpp b/tools/llvm-profdata/llvm-profdata.cpp index 4f919b06ff2..f274f5a9110 100644 --- a/tools/llvm-profdata/llvm-profdata.cpp +++ b/tools/llvm-profdata/llvm-profdata.cpp @@ -306,7 +306,7 @@ static void writeInstrProfile(StringRef OutputFilename, InstrProfWriter &Writer) { std::error_code EC; raw_fd_ostream Output(OutputFilename.data(), EC, - OutputFormat == PF_Text ? sys::fs::OF_Text + OutputFormat == PF_Text ? sys::fs::OF_TextWithCRLF : sys::fs::OF_None); if (EC) exitWithErrorCode(EC, OutputFilename); @@ -1931,7 +1931,7 @@ static int overlap_main(int argc, const char *argv[]) { cl::ParseCommandLineOptions(argc, argv, "LLVM profile data overlap tool\n"); std::error_code EC; - raw_fd_ostream OS(Output.data(), EC, sys::fs::OF_Text); + raw_fd_ostream OS(Output.data(), EC, sys::fs::OF_TextWithCRLF); if (EC) exitWithErrorCode(EC, Output); @@ -2457,7 +2457,7 @@ static int show_main(int argc, const char *argv[]) { } std::error_code EC; - raw_fd_ostream OS(OutputFilename.data(), EC, sys::fs::OF_Text); + raw_fd_ostream OS(OutputFilename.data(), EC, sys::fs::OF_TextWithCRLF); if (EC) exitWithErrorCode(EC, OutputFilename); diff --git a/tools/llvm-xray/xray-account.cpp b/tools/llvm-xray/xray-account.cpp index bde028a432f..111704665c0 100644 --- a/tools/llvm-xray/xray-account.cpp +++ b/tools/llvm-xray/xray-account.cpp @@ -459,7 +459,7 @@ static CommandRegistration Unused(&Account, []() -> Error { } std::error_code EC; - raw_fd_ostream OS(AccountOutput, EC, sys::fs::OpenFlags::OF_Text); + raw_fd_ostream OS(AccountOutput, EC, sys::fs::OpenFlags::OF_TextWithCRLF); if (EC) return make_error( Twine("Cannot open file '") + AccountOutput + "' for writing.", EC); diff --git a/tools/llvm-xray/xray-converter.cpp b/tools/llvm-xray/xray-converter.cpp index 645e2e3d719..47cb645a540 100644 --- a/tools/llvm-xray/xray-converter.cpp +++ b/tools/llvm-xray/xray-converter.cpp @@ -381,7 +381,7 @@ static CommandRegistration Unused(&Convert, []() -> Error { raw_fd_ostream OS(ConvertOutput, EC, ConvertOutputFormat == ConvertFormats::BINARY ? sys::fs::OpenFlags::OF_None - : sys::fs::OpenFlags::OF_Text); + : sys::fs::OpenFlags::OF_TextWithCRLF); if (EC) return make_error( Twine("Cannot open file '") + ConvertOutput + "' for writing.", EC); diff --git a/tools/llvm-xray/xray-extract.cpp b/tools/llvm-xray/xray-extract.cpp index 8304d2d27af..a6ffacc6ab9 100644 --- a/tools/llvm-xray/xray-extract.cpp +++ b/tools/llvm-xray/xray-extract.cpp @@ -83,7 +83,7 @@ static CommandRegistration Unused(&Extract, []() -> Error { InstrumentationMapOrError.takeError()); std::error_code EC; - raw_fd_ostream OS(ExtractOutput, EC, sys::fs::OpenFlags::OF_Text); + raw_fd_ostream OS(ExtractOutput, EC, sys::fs::OpenFlags::OF_TextWithCRLF); if (EC) return make_error( Twine("Cannot open file '") + ExtractOutput + "' for writing.", EC); diff --git a/tools/llvm-xray/xray-graph-diff.cpp b/tools/llvm-xray/xray-graph-diff.cpp index 9ff84f22d82..f22ea06e053 100644 --- a/tools/llvm-xray/xray-graph-diff.cpp +++ b/tools/llvm-xray/xray-graph-diff.cpp @@ -456,7 +456,7 @@ static CommandRegistration Unused(&GraphDiff, []() -> Error { auto &GDR = *GDROrErr; std::error_code EC; - raw_fd_ostream OS(GraphDiffOutput, EC, sys::fs::OpenFlags::OF_Text); + raw_fd_ostream OS(GraphDiffOutput, EC, sys::fs::OpenFlags::OF_TextWithCRLF); if (EC) return make_error( Twine("Cannot open file '") + GraphDiffOutput + "' for writing.", EC); diff --git a/tools/llvm-xray/xray-graph.cpp b/tools/llvm-xray/xray-graph.cpp index 00a1807c07c..39d2c5c153e 100644 --- a/tools/llvm-xray/xray-graph.cpp +++ b/tools/llvm-xray/xray-graph.cpp @@ -523,7 +523,7 @@ static CommandRegistration Unused(&GraphC, []() -> Error { auto &GR = *GROrError; std::error_code EC; - raw_fd_ostream OS(GraphOutput, EC, sys::fs::OpenFlags::OF_Text); + raw_fd_ostream OS(GraphOutput, EC, sys::fs::OpenFlags::OF_TextWithCRLF); if (EC) return make_error( Twine("Cannot open file '") + GraphOutput + "' for writing.", EC); diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 83b7391c0bf..bb0d6b96204 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -700,8 +700,8 @@ int main(int argc, char **argv) { OutputFilename = "-"; std::error_code EC; - sys::fs::OpenFlags Flags = OutputAssembly ? sys::fs::OF_Text - : sys::fs::OF_None; + sys::fs::OpenFlags Flags = + OutputAssembly ? sys::fs::OF_TextWithCRLF : sys::fs::OF_None; Out.reset(new ToolOutputFile(OutputFilename, EC, Flags)); if (EC) { errs() << EC.message() << '\n'; diff --git a/tools/verify-uselistorder/verify-uselistorder.cpp b/tools/verify-uselistorder/verify-uselistorder.cpp index cbd2f85ec3e..28d3467d715 100644 --- a/tools/verify-uselistorder/verify-uselistorder.cpp +++ b/tools/verify-uselistorder/verify-uselistorder.cpp @@ -136,7 +136,7 @@ bool TempFile::writeBitcode(const Module &M) const { bool TempFile::writeAssembly(const Module &M) const { LLVM_DEBUG(dbgs() << " - write assembly\n"); std::error_code EC; - raw_fd_ostream OS(Filename, EC, sys::fs::OF_Text); + raw_fd_ostream OS(Filename, EC, sys::fs::OF_TextWithCRLF); if (EC) { errs() << "verify-uselistorder: error: " << EC.message() << "\n"; return true; diff --git a/unittests/Support/Path.cpp b/unittests/Support/Path.cpp index 73f0cbbaae3..35b41092fdd 100644 --- a/unittests/Support/Path.cpp +++ b/unittests/Support/Path.cpp @@ -1253,7 +1253,7 @@ TEST_F(FileSystemTest, CarriageReturn) { path::append(FilePathname, "test"); { - raw_fd_ostream File(FilePathname, EC, sys::fs::OF_Text); + raw_fd_ostream File(FilePathname, EC, sys::fs::OF_TextWithCRLF); ASSERT_NO_ERROR(EC); File << '\n'; }