maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang][runtime] Handle endian-swapped record headers & footers on input 

The runtime I/O library correctly handles endianness conversions on payload
data I/O and on the output of sequential record headers and footers, but
does not swap endianness when required when reading sequential record headers
and footers back in for READ and BACKSPACE statements.  Mea culpa.  Fix.

Fixes https://github.com/llvm/llvm-project/issues/57126

Differential Revision: https://reviews.llvm.org/D132168
This commit is contained in:
Peter Klausler 2022-08-18 09:52:17 -07:00
parent cc180f4c8c
commit c7fe5e83db
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flang/runtime/unit.cpp
View File

@ -279,7 +279,7 @@ void ExternalFileUnit::FlushAll(IoErrorHandler &handler) {
}
}
static void SwapEndianness(
static inline void SwapEndianness(
char *data, std::size_t bytes, std::size_t elementBytes) {
if (elementBytes > 1) {
auto half{elementBytes >> 1};
@ -733,7 +733,7 @@ void ExternalFileUnit::BeginSequentialVariableUnformattedInputRecord(
"record #%jd (file offset %jd): truncated record header";
}
} else {
std::memcpy(&header, Frame() + recordOffsetInFrame_, sizeof header);
header = ReadHeaderOrFooter(recordOffsetInFrame_);
recordLength = sizeof header + header; // does not include footer
need = recordOffsetInFrame_ + *recordLength + sizeof footer;
got = ReadFrame(frameOffsetInFile_, need, handler);
@ -742,8 +742,7 @@ void ExternalFileUnit::BeginSequentialVariableUnformattedInputRecord(
"record #%jd (file offset %jd): hit EOF reading record with "
"length %jd bytes";
} else {
std::memcpy(&footer, Frame() + recordOffsetInFrame_ + *recordLength,
sizeof footer);
footer = ReadHeaderOrFooter(recordOffsetInFrame_ + *recordLength);
if (footer != header) {
error = "Unformatted variable-length sequential file input failed at "
"record #%jd (file offset %jd): record header has length %jd "
@ -800,7 +799,7 @@ void ExternalFileUnit::BackspaceFixedRecord(IoErrorHandler &handler) {
void ExternalFileUnit::BackspaceVariableUnformattedRecord(
IoErrorHandler &handler) {
std::int32_t header{0}, footer{0};
std::int32_t header{0};
auto headerBytes{static_cast<std::int64_t>(sizeof header)};
frameOffsetInFile_ += recordOffsetInFrame_;
recordOffsetInFrame_ = 0;
@ -817,8 +816,7 @@ void ExternalFileUnit::BackspaceVariableUnformattedRecord(
handler.SignalError(IostatShortRead);
return;
}
std::memcpy(&footer, Frame(), sizeof footer);
recordLength = footer;
recordLength = ReadHeaderOrFooter(0);
if (frameOffsetInFile_ < *recordLength + 2 * headerBytes) {
handler.SignalError(IostatBadUnformattedRecord);
return;
@ -835,7 +833,7 @@ void ExternalFileUnit::BackspaceVariableUnformattedRecord(
handler.SignalError(IostatShortRead);
return;
}
std::memcpy(&header, Frame() + recordOffsetInFrame_, sizeof header);
header = ReadHeaderOrFooter(recordOffsetInFrame_);
if (header != *recordLength) {
handler.SignalError(IostatBadUnformattedRecord);
return;
@ -993,6 +991,16 @@ bool ExternalFileUnit::Wait(int id) {
}
}
std::int32_t ExternalFileUnit::ReadHeaderOrFooter(std::int64_t frameOffset) {
std::int32_t word;
char *wordPtr{reinterpret_cast<char *>(&word)};
std::memcpy(wordPtr, Frame() + frameOffset, sizeof word);
if (swapEndianness_) {
SwapEndianness(wordPtr, sizeof word, sizeof word);
}
return word;
}
void ChildIo::EndIoStatement() {
io_.reset();
u_.emplace<std::monostate>();

1
flang/runtime/unit.h
View File

@ -134,6 +134,7 @@ private:
void CommitWrites();
bool CheckDirectAccess(IoErrorHandler &);
void HitEndOnRead(IoErrorHandler &);
std::int32_t ReadHeaderOrFooter(std::int64_t frameOffset);
Lock lock_;
// TODO: replace with a thread ID