[llvm] [flang][runtime] Catch bad OPEN specifiers for unformatted files (PR #153707)
Peter Klausler via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 14 15:43:03 PDT 2025
https://github.com/klausler created https://github.com/llvm/llvm-project/pull/153707
When an OPEN statement has specifiers that are allowed only for formatted files, detect an error when the file turns out to be unformatted.
Fixes https://github.com/llvm/llvm-project/issues/153480.
>From 7775d4b4c9c0c7c21e84acba849235bc8672d0b0 Mon Sep 17 00:00:00 2001
From: Peter Klausler <pklausler at nvidia.com>
Date: Thu, 14 Aug 2025 15:40:19 -0700
Subject: [PATCH] [flang][runtime] Catch bad OPEN specifiers for unformatted
files
When an OPEN statement has specifiers that are allowed only for
formatted files, detect an error when the file turns out to be
unformatted.
Fixes https://github.com/llvm/llvm-project/issues/153480.
---
flang-rt/include/flang-rt/runtime/io-stmt.h | 4 ++++
flang-rt/lib/runtime/io-api.cpp | 24 +++++++++++++++++++--
flang-rt/lib/runtime/io-stmt.cpp | 4 ++++
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/flang-rt/include/flang-rt/runtime/io-stmt.h b/flang-rt/include/flang-rt/runtime/io-stmt.h
index 9f71d515cb615..7693b60cccfc9 100644
--- a/flang-rt/include/flang-rt/runtime/io-stmt.h
+++ b/flang-rt/include/flang-rt/runtime/io-stmt.h
@@ -729,6 +729,9 @@ class OpenStatementState : public ExternalIoStatementBase {
RT_API_ATTRS void set_isUnformatted(bool yes = true) {
isUnformatted_ = yes;
} // FORM=
+ RT_API_ATTRS void set_mustBeFormatted(bool yes = true) {
+ mustBeFormatted_ = yes;
+ }
RT_API_ATTRS void CompleteOperation();
RT_API_ATTRS int EndIoStatement();
@@ -743,6 +746,7 @@ class OpenStatementState : public ExternalIoStatementBase {
OwningPtr<char> path_;
std::size_t pathLength_{};
Fortran::common::optional<bool> isUnformatted_;
+ Fortran::common::optional<bool> mustBeFormatted_;
Fortran::common::optional<Access> access_;
};
diff --git a/flang-rt/lib/runtime/io-api.cpp b/flang-rt/lib/runtime/io-api.cpp
index 6af0121437cd5..c7c15e77c0770 100644
--- a/flang-rt/lib/runtime/io-api.cpp
+++ b/flang-rt/lib/runtime/io-api.cpp
@@ -528,6 +528,9 @@ bool IODEF(SetAdvance)(Cookie cookie, const char *keyword, std::size_t length) {
bool IODEF(SetBlank)(Cookie cookie, const char *keyword, std::size_t length) {
IoStatementState &io{*cookie};
+ if (auto *open{io.get_if<OpenStatementState>()}) {
+ open->set_mustBeFormatted();
+ }
static const char *keywords[]{"NULL", "ZERO", nullptr};
switch (IdentifyValue(keyword, length, keywords)) {
case 0:
@@ -545,6 +548,9 @@ bool IODEF(SetBlank)(Cookie cookie, const char *keyword, std::size_t length) {
bool IODEF(SetDecimal)(Cookie cookie, const char *keyword, std::size_t length) {
IoStatementState &io{*cookie};
+ if (auto *open{io.get_if<OpenStatementState>()}) {
+ open->set_mustBeFormatted();
+ }
static const char *keywords[]{"COMMA", "POINT", nullptr};
switch (IdentifyValue(keyword, length, keywords)) {
case 0:
@@ -562,6 +568,9 @@ bool IODEF(SetDecimal)(Cookie cookie, const char *keyword, std::size_t length) {
bool IODEF(SetDelim)(Cookie cookie, const char *keyword, std::size_t length) {
IoStatementState &io{*cookie};
+ if (auto *open{io.get_if<OpenStatementState>()}) {
+ open->set_mustBeFormatted();
+ }
static const char *keywords[]{"APOSTROPHE", "QUOTE", "NONE", nullptr};
switch (IdentifyValue(keyword, length, keywords)) {
case 0:
@@ -583,6 +592,9 @@ bool IODEF(SetDelim)(Cookie cookie, const char *keyword, std::size_t length) {
bool IODEF(SetPad)(Cookie cookie, const char *keyword, std::size_t length) {
IoStatementState &io{*cookie};
IoErrorHandler &handler{io.GetIoErrorHandler()};
+ if (auto *open{io.get_if<OpenStatementState>()}) {
+ open->set_mustBeFormatted();
+ }
io.mutableModes().pad = YesOrNo(keyword, length, "PAD", handler);
return !handler.InError();
}
@@ -617,6 +629,9 @@ bool IODEF(SetRec)(Cookie cookie, std::int64_t rec) {
bool IODEF(SetRound)(Cookie cookie, const char *keyword, std::size_t length) {
IoStatementState &io{*cookie};
+ if (auto *open{io.get_if<OpenStatementState>()}) {
+ open->set_mustBeFormatted();
+ }
static const char *keywords[]{"UP", "DOWN", "ZERO", "NEAREST", "COMPATIBLE",
"PROCESSOR_DEFINED", nullptr};
switch (IdentifyValue(keyword, length, keywords)) {
@@ -647,6 +662,9 @@ bool IODEF(SetRound)(Cookie cookie, const char *keyword, std::size_t length) {
bool IODEF(SetSign)(Cookie cookie, const char *keyword, std::size_t length) {
IoStatementState &io{*cookie};
+ if (auto *open{io.get_if<OpenStatementState>()}) {
+ open->set_mustBeFormatted();
+ }
static const char *keywords[]{
"PLUS", "SUPPRESS", "PROCESSOR_DEFINED", nullptr};
switch (IdentifyValue(keyword, length, keywords)) {
@@ -784,6 +802,7 @@ bool IODEF(SetCarriagecontrol)(
io.GetIoErrorHandler().Crash(
"SetCarriageControl() called after GetNewUnit() for an OPEN statement");
}
+ open->set_mustBeFormatted();
static const char *keywords[]{"LIST", "FORTRAN", "NONE", nullptr};
switch (IdentifyValue(keyword, length, keywords)) {
case 0:
@@ -840,6 +859,7 @@ bool IODEF(SetEncoding)(
io.GetIoErrorHandler().Crash(
"SetEncoding() called after GetNewUnit() for an OPEN statement");
}
+ open->set_mustBeFormatted();
// Allow the encoding to be changed on an open unit -- it's
// useful and safe.
static const char *keywords[]{"UTF-8", "DEFAULT", nullptr};
@@ -872,10 +892,10 @@ bool IODEF(SetForm)(Cookie cookie, const char *keyword, std::size_t length) {
}
static const char *keywords[]{"FORMATTED", "UNFORMATTED", "BINARY", nullptr};
switch (IdentifyValue(keyword, length, keywords)) {
- case 0:
+ case 0: // FORM='FORMATTED'
open->set_isUnformatted(false);
break;
- case 1:
+ case 1: // FORM='UNFORMATTED'
open->set_isUnformatted(true);
break;
case 2: // legacy FORM='BINARY' means an unformatted stream
diff --git a/flang-rt/lib/runtime/io-stmt.cpp b/flang-rt/lib/runtime/io-stmt.cpp
index e08088fab4311..ad520ceae92a3 100644
--- a/flang-rt/lib/runtime/io-stmt.cpp
+++ b/flang-rt/lib/runtime/io-stmt.cpp
@@ -352,6 +352,10 @@ void OpenStatementState::CompleteOperation() {
// Set default format (C.7.4 point 2).
unit().isUnformatted = unit().access != Access::Sequential;
}
+ if (unit().isUnformatted.value_or(false) && mustBeFormatted_) {
+ SignalError(
+ "FORM='UNFORMATTED' is not allowed with formatted I/O OPEN specifiers");
+ }
if (!wasExtant_ && InError()) {
// Release the new unit on failure
set_destroy();
More information about the llvm-commits
mailing list