https://github.com/abhina-sree created https://github.com/llvm/llvm-project/pull/125570
This patch continues the work that was started here https://reviews.llvm.org/D99426 to correctly open text files in text mode. >From 7ac3589c34f4cb48bbf9b0fea74adfc9fccaecdf Mon Sep 17 00:00:00 2001 From: Abhina Sreeskantharajan <abhina.sreeskanthara...@ibm.com> Date: Mon, 3 Feb 2025 15:19:24 -0500 Subject: [PATCH] [SystemZ][z/OS] Open text files in text mode --- clang-tools-extra/clang-doc/HTMLGenerator.cpp | 6 +++--- clang-tools-extra/clang-doc/MDGenerator.cpp | 6 +++--- clang-tools-extra/clang-doc/YAMLGenerator.cpp | 2 +- clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.cpp | 2 +- clang-tools-extra/clang-include-fixer/YamlSymbolIndex.cpp | 2 +- .../find-all-symbols/tool/FindAllSymbolsMain.cpp | 4 ++-- .../clang-include-fixer/tool/ClangIncludeFixer.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/clang-tools-extra/clang-doc/HTMLGenerator.cpp b/clang-tools-extra/clang-doc/HTMLGenerator.cpp index e3532559a32fcca..a6ebc007278db40 100644 --- a/clang-tools-extra/clang-doc/HTMLGenerator.cpp +++ b/clang-tools-extra/clang-doc/HTMLGenerator.cpp @@ -964,7 +964,7 @@ HTMLGenerator::generateDocs(StringRef RootDir, for (const auto &Group : FileToInfos) { std::error_code FileErr; llvm::raw_fd_ostream InfoOS(Group.getKey(), FileErr, - llvm::sys::fs::OF_None); + llvm::sys::fs::OF_Text); if (FileErr) { return llvm::createStringError(FileErr, "Error opening file '%s'", Group.getKey().str().c_str()); @@ -1047,7 +1047,7 @@ static llvm::Error serializeIndex(ClangDocContext &CDCtx) { llvm::SmallString<128> FilePath; llvm::sys::path::native(CDCtx.OutDirectory, FilePath); llvm::sys::path::append(FilePath, "index_json.js"); - llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_None); + llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_Text); if (FileErr != OK) { return llvm::createStringError(llvm::inconvertibleErrorCode(), "error creating index file: " + @@ -1108,7 +1108,7 @@ static llvm::Error genIndex(const ClangDocContext &CDCtx) { llvm::SmallString<128> IndexPath; llvm::sys::path::native(CDCtx.OutDirectory, IndexPath); llvm::sys::path::append(IndexPath, "index.html"); - llvm::raw_fd_ostream IndexOS(IndexPath, FileErr, llvm::sys::fs::OF_None); + llvm::raw_fd_ostream IndexOS(IndexPath, FileErr, llvm::sys::fs::OF_Text); if (FileErr != OK) { return llvm::createStringError(llvm::inconvertibleErrorCode(), "error creating main index: " + diff --git a/clang-tools-extra/clang-doc/MDGenerator.cpp b/clang-tools-extra/clang-doc/MDGenerator.cpp index 28b645cf021ddf3..7bef2c0db04d8ce 100644 --- a/clang-tools-extra/clang-doc/MDGenerator.cpp +++ b/clang-tools-extra/clang-doc/MDGenerator.cpp @@ -300,7 +300,7 @@ static llvm::Error serializeIndex(ClangDocContext &CDCtx) { llvm::SmallString<128> FilePath; llvm::sys::path::native(CDCtx.OutDirectory, FilePath); llvm::sys::path::append(FilePath, "all_files.md"); - llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_None); + llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_Text); if (FileErr) return llvm::createStringError(llvm::inconvertibleErrorCode(), "error creating index file: " + @@ -323,7 +323,7 @@ static llvm::Error genIndex(ClangDocContext &CDCtx) { llvm::SmallString<128> FilePath; llvm::sys::path::native(CDCtx.OutDirectory, FilePath); llvm::sys::path::append(FilePath, "index.md"); - llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_None); + llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::OF_Text); if (FileErr) return llvm::createStringError(llvm::inconvertibleErrorCode(), "error creating index file: " + @@ -407,7 +407,7 @@ MDGenerator::generateDocs(StringRef RootDir, for (const auto &Group : FileToInfos) { std::error_code FileErr; llvm::raw_fd_ostream InfoOS(Group.getKey(), FileErr, - llvm::sys::fs::OF_None); + llvm::sys::fs::OF_Text); if (FileErr) { return llvm::createStringError(FileErr, "Error opening file '%s'", Group.getKey().str().c_str()); diff --git a/clang-tools-extra/clang-doc/YAMLGenerator.cpp b/clang-tools-extra/clang-doc/YAMLGenerator.cpp index b612380a3cfa7fa..ffabd2fd8222935 100644 --- a/clang-tools-extra/clang-doc/YAMLGenerator.cpp +++ b/clang-tools-extra/clang-doc/YAMLGenerator.cpp @@ -347,7 +347,7 @@ YAMLGenerator::generateDocs(StringRef RootDir, } std::error_code FileErr; - llvm::raw_fd_ostream InfoOS(Path, FileErr, llvm::sys::fs::OF_None); + llvm::raw_fd_ostream InfoOS(Path, FileErr, llvm::sys::fs::OF_Text); if (FileErr) { return llvm::createStringError(FileErr, "Error opening file '%s'", Path.c_str()); diff --git a/clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.cpp b/clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.cpp index 91e2a9396a5594e..98987ad380196fa 100644 --- a/clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.cpp +++ b/clang-tools-extra/clang-include-fixer/FuzzySymbolIndex.cpp @@ -131,7 +131,7 @@ FuzzySymbolIndex::queryRegexp(const std::vector<std::string> &Tokens) { llvm::Expected<std::unique_ptr<FuzzySymbolIndex>> FuzzySymbolIndex::createFromYAML(StringRef FilePath) { - auto Buffer = llvm::MemoryBuffer::getFile(FilePath); + auto Buffer = llvm::MemoryBuffer::getFile(FilePath, /*IsText=*/true); if (!Buffer) return llvm::errorCodeToError(Buffer.getError()); return std::make_unique<MemSymbolIndex>( diff --git a/clang-tools-extra/clang-include-fixer/YamlSymbolIndex.cpp b/clang-tools-extra/clang-include-fixer/YamlSymbolIndex.cpp index 4271d9aa4e67751..7f570ee917197ba 100644 --- a/clang-tools-extra/clang-include-fixer/YamlSymbolIndex.cpp +++ b/clang-tools-extra/clang-include-fixer/YamlSymbolIndex.cpp @@ -22,7 +22,7 @@ namespace include_fixer { llvm::ErrorOr<std::unique_ptr<YamlSymbolIndex>> YamlSymbolIndex::createFromFile(llvm::StringRef FilePath) { - auto Buffer = llvm::MemoryBuffer::getFile(FilePath); + auto Buffer = llvm::MemoryBuffer::getFile(FilePath, /*IsText=*/true); if (!Buffer) return Buffer.getError(); diff --git a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp b/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp index 298b02e77cb0aa3..6bac717bbb0132a 100644 --- a/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp +++ b/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/FindAllSymbolsMain.cpp @@ -95,7 +95,7 @@ bool Merge(llvm::StringRef MergeDir, llvm::StringRef OutputFile) { // Parse YAML files in parallel. Pool.async( [&AddSymbols](std::string Path) { - auto Buffer = llvm::MemoryBuffer::getFile(Path); + auto Buffer = llvm::MemoryBuffer::getFile(Path, /*IsText=*/true); if (!Buffer) { llvm::errs() << "Can't open " << Path << "\n"; return; @@ -114,7 +114,7 @@ bool Merge(llvm::StringRef MergeDir, llvm::StringRef OutputFile) { } } - llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::OF_None); + llvm::raw_fd_ostream OS(OutputFile, EC, llvm::sys::fs::OF_Text); if (EC) { llvm::errs() << "Can't open '" << OutputFile << "': " << EC.message() << '\n'; diff --git a/clang-tools-extra/clang-include-fixer/tool/ClangIncludeFixer.cpp b/clang-tools-extra/clang-include-fixer/tool/ClangIncludeFixer.cpp index 3a11a22def19468..6e51f25a6640742 100644 --- a/clang-tools-extra/clang-include-fixer/tool/ClangIncludeFixer.cpp +++ b/clang-tools-extra/clang-include-fixer/tool/ClangIncludeFixer.cpp @@ -415,7 +415,7 @@ int includeFixerMain(int argc, const char **argv) { llvm::errs() << llvm::toString(InsertStyle.takeError()) << "\n"; return 1; } - auto Buffer = llvm::MemoryBuffer::getFile(FilePath); + auto Buffer = llvm::MemoryBuffer::getFile(FilePath, /*IsText=*/true); if (!Buffer) { errs() << "Couldn't open file: " + FilePath.str() + ": " << Buffer.getError().message() + "\n"; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
