[clang] Load AST files as binary on z/OS (PR #191840)
Sean Perry via cfe-commits
cfe-commits at lists.llvm.org
Tue Apr 14 10:49:33 PDT 2026
https://github.com/perry-ca updated https://github.com/llvm/llvm-project/pull/191840
>From 55a6f6ffd156ad8b15ac531cf933ef3cb6091f83 Mon Sep 17 00:00:00 2001
From: Sean Perry <perry at ca.ibm.com>
Date: Thu, 9 Apr 2026 16:24:39 -0400
Subject: [PATCH 1/3] Load AST files as binary on z/OS
---
clang/include/clang/Basic/FileManager.h | 5 +++--
clang/lib/Basic/Module.cpp | 3 ++-
clang/lib/Serialization/ASTReader.cpp | 25 ++++++++++++++++++-----
clang/lib/Serialization/ModuleManager.cpp | 13 ++++++++----
4 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/clang/include/clang/Basic/FileManager.h b/clang/include/clang/Basic/FileManager.h
index 01ce243e1b5fc..e440a57e3a866 100644
--- a/clang/include/clang/Basic/FileManager.h
+++ b/clang/include/clang/Basic/FileManager.h
@@ -207,9 +207,10 @@ class FileManager : public RefCountedBase<FileManager> {
/// Get a FileEntryRef if it exists, without doing anything on error.
OptionalFileEntryRef getOptionalFileRef(StringRef Filename,
bool OpenFile = false,
- bool CacheFailure = true) {
+ bool CacheFailure = true,
+ bool IsText = true) {
return llvm::expectedToOptional(
- getFileRef(Filename, OpenFile, CacheFailure));
+ getFileRef(Filename, OpenFile, CacheFailure, IsText));
}
/// Returns the current file system options
diff --git a/clang/lib/Basic/Module.cpp b/clang/lib/Basic/Module.cpp
index 81e28e46d36ca..869d0a5b0c3cf 100644
--- a/clang/lib/Basic/Module.cpp
+++ b/clang/lib/Basic/Module.cpp
@@ -45,7 +45,8 @@ ModuleFileName::makeKey(FileManager &FileMgr) const {
return ModuleFileKey(*ModuleCache, ImplicitModuleSuffix);
} else {
if (auto ModuleFile = FileMgr.getOptionalFileRef(Path, /*OpenFile=*/true,
- /*CacheFailure=*/false))
+ /*CacheFailure=*/false,
+ /*IsText=*/false))
return ModuleFileKey(*ModuleFile);
}
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index b328114ef240f..54834bb301cea 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -2873,7 +2873,9 @@ InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) {
Overridden = false;
}
- auto File = FileMgr.getOptionalFileRef(*Filename, /*OpenFile=*/false);
+ auto File = FileMgr.getOptionalFileRef(*Filename, /*OpenFile=*/false,
+ /*CacheFailure=*/true,
+ /*IsText=*/false);
// For an overridden file, create a virtual file with the stored
// size/timestamp.
@@ -2932,7 +2934,12 @@ InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) {
if (StoredContentHash == 0)
return OriginalChange;
- auto MemBuffOrError = FileMgr.getBufferForFile(*File);
+ auto MemBuffOrError =
+ FileMgr.getBufferForFile(*File,
+ /*IsVolatile=*/false,
+ /*RequiresNullTerminator=*/false,
+ /*MaybeLimit=*/std::nullopt,
+ /*IsText=*/false);
if (!MemBuffOrError) {
if (!Complain)
return OriginalChange;
@@ -5948,13 +5955,21 @@ bool ASTReader::readASTFileControlBlock(
// FIXME: This allows use of the VFS; we do not allow use of the
// VFS when actually loading a module.
- auto Entry =
- Filename == "-" ? FileMgr.getSTDIN() : FileMgr.getFileRef(Filename);
+ auto Entry = Filename == "-" ? FileMgr.getSTDIN()
+ : FileMgr.getFileRef(Filename,
+ /*OpenFile=*/false,
+ /*CacheFailure=*/true,
+ /*IsText=*/false);
if (!Entry) {
llvm::consumeError(Entry.takeError());
return true;
}
- auto BufferOrErr = FileMgr.getBufferForFile(*Entry);
+ auto BufferOrErr =
+ FileMgr.getBufferForFile(*Entry,
+ /*IsVolatile=*/false,
+ /*RequiresNullTerminator=*/false,
+ /*MaybeLimit=*/std::nullopt,
+ /*IsText=*/false);
if (!BufferOrErr)
return true;
OwnedBuffer = std::move(*BufferOrErr);
diff --git a/clang/lib/Serialization/ModuleManager.cpp b/clang/lib/Serialization/ModuleManager.cpp
index 022e2ef42f635..c8a5e57425780 100644
--- a/clang/lib/Serialization/ModuleManager.cpp
+++ b/clang/lib/Serialization/ModuleManager.cpp
@@ -61,7 +61,8 @@ ModuleFile *ModuleManager::lookup(ModuleFileKey Key) const {
std::unique_ptr<llvm::MemoryBuffer>
ModuleManager::lookupBuffer(StringRef Name) {
auto Entry = FileMgr.getOptionalFileRef(Name, /*OpenFile=*/false,
- /*CacheFailure=*/false);
+ /*CacheFailure=*/false,
+ /*IsText=*/false);
if (!Entry)
return nullptr;
return std::move(InMemoryBuffers[*Entry]);
@@ -175,7 +176,8 @@ ModuleManager::AddModuleResult ModuleManager::addModule(
// should store this directly in the in-memory module cache.
OptionalFileEntryRef Entry =
FileMgr.getOptionalFileRef(FileName, /*OpenFile=*/true,
- /*CacheFailure=*/false);
+ /*CacheFailure=*/false,
+ /*IsText=*/false);
if (!Entry) {
ErrorStr = "module file not found";
return Missing;
@@ -200,7 +202,8 @@ ModuleManager::AddModuleResult ModuleManager::addModule(
FileName == StringRef("-")
? FileMgr.getSTDIN()
: FileMgr.getFileRef(FileName, /*OpenFile=*/true,
- /*CacheFailure=*/false);
+ /*CacheFailure=*/false,
+ /*IsText=*/false);
if (!Entry)
return Entry.takeError();
@@ -211,7 +214,9 @@ ModuleManager::AddModuleResult ModuleManager::addModule(
// this allows the file to still be mmapped.
return llvm::errorOrToExpected(
FileMgr.getBufferForFile(*Entry, /*IsVolatile=*/false,
- /*RequiresNullTerminator=*/false));
+ /*RequiresNullTerminator=*/false,
+ /*MaybeLimit=*/std::nullopt,
+ /*IsText=*/false));
}();
if (!Buf) {
>From 542834925388ab869cd09b0ebee2c74ac756a624 Mon Sep 17 00:00:00 2001
From: Sean Perry <perry at ca.ibm.com>
Date: Tue, 14 Apr 2026 13:44:13 -0400
Subject: [PATCH 2/3] header files should still be text
---
clang/lib/Serialization/ASTReader.cpp | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 54834bb301cea..c9a3cfd43d86f 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -2873,9 +2873,7 @@ InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) {
Overridden = false;
}
- auto File = FileMgr.getOptionalFileRef(*Filename, /*OpenFile=*/false,
- /*CacheFailure=*/true,
- /*IsText=*/false);
+ auto File = FileMgr.getOptionalFileRef(*Filename, /*OpenFile=*/false);
// For an overridden file, create a virtual file with the stored
// size/timestamp.
@@ -2935,11 +2933,7 @@ InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) {
return OriginalChange;
auto MemBuffOrError =
- FileMgr.getBufferForFile(*File,
- /*IsVolatile=*/false,
- /*RequiresNullTerminator=*/false,
- /*MaybeLimit=*/std::nullopt,
- /*IsText=*/false);
+ FileMgr.getBufferForFile(*File);
if (!MemBuffOrError) {
if (!Complain)
return OriginalChange;
>From 76958f0f315d11288679edb6e584b7d00b82825b Mon Sep 17 00:00:00 2001
From: Sean Perry <perry at ca.ibm.com>
Date: Tue, 14 Apr 2026 13:49:12 -0400
Subject: [PATCH 3/3] formatting
---
clang/lib/Serialization/ASTReader.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index c9a3cfd43d86f..4e1430bd8ad05 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -2932,8 +2932,7 @@ InputFile ASTReader::getInputFile(ModuleFile &F, unsigned ID, bool Complain) {
if (StoredContentHash == 0)
return OriginalChange;
- auto MemBuffOrError =
- FileMgr.getBufferForFile(*File);
+ auto MemBuffOrError = FileMgr.getBufferForFile(*File);
if (!MemBuffOrError) {
if (!Complain)
return OriginalChange;
More information about the cfe-commits
mailing list