Skip to content

[Support] Prevent loss of file type flags when creating temporary #167939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 14, 2025
Merged

[Support] Prevent loss of file type flags when creating temporary #167939

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5472947
Prevent loss of file type flags when creating temporary
Nov 13, 2025
50a7686
syntax fix
Nov 13, 2025
ba2c421
add test for output encoding and consolidate code
Nov 13, 2025
6a1a42a
formatting
Nov 13, 2025
ef66e2d
formatting
Nov 13, 2025
97ce4a6
Fix test failure on Windows
Nov 14, 2025
e508384
Merge branch 'main' into tltao/vfs_tempfile_flags
tltao Nov 14, 2025
bd041f5
add comment
Nov 14, 2025
42160c6
remove trailing space
Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions clang/test/CodeGen/SystemZ/encoding.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Checks encoding of output file
// This is only required for z/OS.
//
// REQUIRES: system-zos, systemz-registered-target
// RUN: %clang_cc1 -triple s390x-ibm-zos -S %s -o %t.s
// RUN: ls -T %t.s | FileCheck %s

// CHECK: t IBM-1047 T=on
void foo() { return; }
23 changes: 15 additions & 8 deletions llvm/lib/Support/VirtualOutputBackends.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,18 @@ static Error createDirectoriesOnDemand(StringRef OutputPath,
});
}

static sys::fs::OpenFlags generateFlagsFromConfig(OutputConfig Config) {
sys::fs::OpenFlags OF = sys::fs::OF_None;
if (Config.getTextWithCRLF())
OF |= sys::fs::OF_TextWithCRLF;
else if (Config.getText())
OF |= sys::fs::OF_Text;
if (Config.getAppend() && !Config.getAtomicWrite())
OF |= sys::fs::OF_Append;

return OF;
}

Error OnDiskOutputFile::tryToCreateTemporary(std::optional<int> &FD) {
// Create a temporary file.
// Insert -%%%%%%%% before the extension (if any), and because some tools
Expand All @@ -269,8 +281,9 @@ Error OnDiskOutputFile::tryToCreateTemporary(std::optional<int> &FD) {
return createDirectoriesOnDemand(OutputPath, Config, [&]() -> Error {
int NewFD;
SmallString<128> UniquePath;
sys::fs::OpenFlags OF = generateFlagsFromConfig(Config);
if (std::error_code EC =
sys::fs::createUniqueFile(ModelPath, NewFD, UniquePath))
sys::fs::createUniqueFile(ModelPath, NewFD, UniquePath, OF))
return make_error<TempFileOutputError>(ModelPath, OutputPath, EC);

if (Config.getDiscardOnSignal())
Expand Down Expand Up @@ -312,13 +325,7 @@ Error OnDiskOutputFile::initializeFile(std::optional<int> &FD) {
// Not using a temporary file. Open the final output file.
return createDirectoriesOnDemand(OutputPath, Config, [&]() -> Error {
int NewFD;
sys::fs::OpenFlags OF = sys::fs::OF_None;
if (Config.getTextWithCRLF())
OF |= sys::fs::OF_TextWithCRLF;
else if (Config.getText())
OF |= sys::fs::OF_Text;
if (Config.getAppend())
OF |= sys::fs::OF_Append;
sys::fs::OpenFlags OF = generateFlagsFromConfig(Config);
if (std::error_code EC = sys::fs::openFileForWrite(
OutputPath, NewFD, sys::fs::CD_CreateAlways, OF))
return convertToOutputError(OutputPath, EC);
Expand Down
Loading