This is an archive of the discontinued LLVM Phabricator instance.

Differential D127029

[flang][runtime] Fix WRITE after OPEN(.., POSITION="APPEND")
ClosedPublic

Authored by klausler on Jun 3 2022, 4:07 PM.

Details

Reviewers
vdonaldson
Commits
rG9a163ffe1a50: [flang][runtime] Fix WRITE after OPEN(.., ACCESS="APPEND")
Summary

The initial size of the file was not being captured as the file position
on which the first output buffer should be framed.

Diff Detail

Event Timeline

klausler created this revision.Jun 3 2022, 4:07 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 3 2022, 4:07 PM
Herald added a subscriber: jdoerfert. · View Herald Transcript
klausler requested review of this revision.Jun 3 2022, 4:07 PM
Harbormaster completed remote builds in B167841: Diff 434188.Jun 3 2022, 4:34 PM
vdonaldson added inline comments.Jun 3 2022, 5:26 PM
flang/runtime/unit.cpp
140

I don't see any other uses of IostatOpenBadAppend. Should this value be deleted?

klausler updated this revision to Diff 434219.Jun 3 2022, 5:50 PM
klausler retitled this revision from [flang][runtime] Fix WRITE after OPEN(.., ACCESS="APPEND") to [flang][runtime] Fix WRITE after OPEN(.., POSITION="APPEND").

Restore use of IostatOpenBadAppend error code instead of generic I/O error on a bad OPEN(POSITION='APPEND').

vdonaldson accepted this revision.Jun 3 2022, 5:58 PM
This revision is now accepted and ready to land.Jun 3 2022, 5:58 PM
Harbormaster completed remote builds in B167866: Diff 434219.Jun 3 2022, 6:27 PM
Closed by commit rG9a163ffe1a50: [flang][runtime] Fix WRITE after OPEN(.., ACCESS="APPEND") (authored by klausler). · Explain WhyJun 4 2022, 9:25 AM
This revision was automatically updated to reflect the committed changes.
klausler added a commit: rG9a163ffe1a50: [flang][runtime] Fix WRITE after OPEN(.., ACCESS="APPEND").
trukhaav added a child revision: D126291: [flang][Driver] Update link job on windows.Jun 5 2022, 12:35 AM
rovka removed a child revision: D126291: [flang][Driver] Update link job on windows.Jun 8 2022, 1:58 AM

Revision Contents

PathSize
flang/
runtime/
2 lines
17 lines

Diff 434219

flang/runtime/file.cpp

Context not available.
RUNTIME_CHECK(handler, action.has_value()); RUNTIME_CHECK(handler, action.has_value());
pending_.reset(); pending_.reset();
if (position == Position::Append && !RawSeekToEnd()) { if (position == Position::Append && !RawSeekToEnd()) {
handler.SignalErrno(); handler.SignalError(IostatOpenBadAppend);
} }
isTerminal_ = ::isatty(fd_) == 1; isTerminal_ = ::isatty(fd_) == 1;
mayRead_ = *action != Action::Write; mayRead_ = *action != Action::Write;
Context not available.

flang/runtime/unit.cpp

Context not available.
"OPEN(UNIT=%d,ACCESS='DIRECT',RECL=%jd): record length is invalid", "OPEN(UNIT=%d,ACCESS='DIRECT',RECL=%jd): record length is invalid",
unitNumber(), static_cast<std::intmax_t>(*openRecl)); unitNumber(), static_cast<std::intmax_t>(*openRecl));
} else if (totalBytes && (*totalBytes % *openRecl != 0)) { } else if (totalBytes && (*totalBytes % *openRecl != 0)) {
handler.SignalError(IostatOpenBadAppend, handler.SignalError(IostatOpenBadRecl,
vdonaldsonUnsubmitted
Done
ReplyInline Actions

I don't see any other uses of IostatOpenBadAppend. Should this value be deleted?

vdonaldson: I don't see any other uses of //IostatOpenBadAppend//. Should this value be deleted?
"OPEN(UNIT=%d,ACCESS='DIRECT',RECL=%jd): record length is not an " "OPEN(UNIT=%d,ACCESS='DIRECT',RECL=%jd): record length is not an "
"even divisor of the file size %jd", "even divisor of the file size %jd",
unitNumber(), static_cast<std::intmax_t>(*openRecl), unitNumber(), static_cast<std::intmax_t>(*openRecl),
Context not available.
if (totalBytes && access == Access::Direct && openRecl.value_or(0) > 0) { if (totalBytes && access == Access::Direct && openRecl.value_or(0) > 0) {
endfileRecordNumber = 1 + (*totalBytes / *openRecl); endfileRecordNumber = 1 + (*totalBytes / *openRecl);
} }
if (position == Position::Append && access != Access::Stream) { if (position == Position::Append) {
if (!endfileRecordNumber) { if (totalBytes) {
// Fake it so that we can backspace relative from the end frameOffsetInFile_ = *totalBytes;
endfileRecordNumber = std::numeric_limits<std::int64_t>::max() - 2; }
if (access != Access::Stream) {
if (!endfileRecordNumber) {
// Fake it so that we can backspace relative from the end
endfileRecordNumber = std::numeric_limits<std::int64_t>::max() - 2;
}
currentRecordNumber = *endfileRecordNumber;
} }
currentRecordNumber = *endfileRecordNumber;
} }
} }
Context not available.