Skip to content

[flang][runtime] Don't use endfile record number for EOF detection on… #74640

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 1 commit into from
Dec 11, 2023
Merged

[flang][runtime] Don't use endfile record number for EOF detection on… #74640

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions flang/runtime/unit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,14 @@ bool ExternalFileUnit::BeginReadingRecord(IoErrorHandler &handler) {
RUNTIME_CHECK(handler, direction_ == Direction::Input);
if (!beganReadingRecord_) {
beganReadingRecord_ = true;
// Don't use IsAtEOF() to check for an EOF condition here, just detect
// it from a failed or short read from the file. IsAtEOF() could be
// wrong for formatted input if actual newline characters had been
// written in-band by previous WRITEs before a REWIND. In fact,
// now that we know that the unit is being used for input (again),
// it's best to reset endfileRecordNumber and ensure IsAtEOF() will
// now be true on return only if it gets set by HitEndOnRead().
endfileRecordNumber.reset();
if (access == Access::Direct) {
CheckDirectAccess(handler);
auto need{static_cast<std::size_t>(recordOffsetInFrame_ + *openRecl)};
Expand All @@ -448,17 +456,13 @@ bool ExternalFileUnit::BeginReadingRecord(IoErrorHandler &handler) {
}
} else {
recordLength.reset();
if (IsAtEOF()) {
handler.SignalEnd();
} else {
RUNTIME_CHECK(handler, isUnformatted.has_value());
if (*isUnformatted) {
if (access == Access::Sequential) {
BeginSequentialVariableUnformattedInputRecord(handler);
}
} else { // formatted sequential or stream
BeginVariableFormattedInputRecord(handler);
RUNTIME_CHECK(handler, isUnformatted.has_value());
if (*isUnformatted) {
if (access == Access::Sequential) {
BeginSequentialVariableUnformattedInputRecord(handler);
}
} else { // formatted sequential or stream
BeginVariableFormattedInputRecord(handler);
}
}
}
Expand Down Expand Up @@ -723,6 +727,7 @@ void ExternalFileUnit::EndIoStatement() {

void ExternalFileUnit::BeginSequentialVariableUnformattedInputRecord(
IoErrorHandler &handler) {
RUNTIME_CHECK(handler, access == Access::Sequential);
std::int32_t header{0}, footer{0};
std::size_t need{recordOffsetInFrame_ + sizeof header};
std::size_t got{ReadFrame(frameOffsetInFile_, need, handler)};
Expand Down