Revert "[flang][runtime] Refine state associated with child I/O (llvm#150461)"

breaks 519, 528, 535 for MPI, OMP, and TGT
runtime error

This reverts commit 918d6db.

Author: ronlieb

flang-rt/include/flang-rt/runtime/io-stmt.h

@@ -84,9 +84,6 @@ class IoStatementState {
   // This design avoids virtual member functions and function pointers,
   // which may not have good support in some runtime environments.
 
-  RT_API_ATTRS const NonTbpDefinedIoTable *nonTbpDefinedIoTable() const;
-  RT_API_ATTRS void set_nonTbpDefinedIoTable(const NonTbpDefinedIoTable *);
-
   // CompleteOperation() is the last opportunity to raise an I/O error.
   // It is called by EndIoStatement(), but it can be invoked earlier to
   // catch errors for (e.g.) GetIoMsg() and GetNewUnit().  If called
@@ -366,13 +363,6 @@ class IoStatementBase : public IoErrorHandler {
   using IoErrorHandler::IoErrorHandler;
 
   RT_API_ATTRS bool completedOperation() const { return completedOperation_; }
-  RT_API_ATTRS const NonTbpDefinedIoTable *nonTbpDefinedIoTable() const {
-    return nonTbpDefinedIoTable_;
-  }
-  RT_API_ATTRS void set_nonTbpDefinedIoTable(
-      const NonTbpDefinedIoTable *table) {
-    nonTbpDefinedIoTable_ = table;
-  }
 
   RT_API_ATTRS void CompleteOperation() { completedOperation_ = true; }
   RT_API_ATTRS int EndIoStatement() { return GetIoStat(); }
@@ -407,11 +397,6 @@ class IoStatementBase : public IoErrorHandler {
 
 protected:
   bool completedOperation_{false};
-
-private:
-  // Original NonTbpDefinedIoTable argument to Input/OutputDerivedType,
-  // saved here so that it can also be used in child I/O statements.
-  const NonTbpDefinedIoTable *nonTbpDefinedIoTable_{nullptr};
 };
 
 // Common state for list-directed & NAMELIST I/O, both internal & external
@@ -645,10 +630,8 @@ class ChildIoStatementState : public IoStatementBase,
 public:
   RT_API_ATTRS ChildIoStatementState(
       ChildIo &, const char *sourceFile = nullptr, int sourceLine = 0);
-  RT_API_ATTRS const NonTbpDefinedIoTable *nonTbpDefinedIoTable() const;
-  RT_API_ATTRS void set_nonTbpDefinedIoTable(const NonTbpDefinedIoTable *);
   RT_API_ATTRS ChildIo &child() { return child_; }
-  RT_API_ATTRS MutableModes &mutableModes() { return mutableModes_; }
+  RT_API_ATTRS MutableModes &mutableModes();
   RT_API_ATTRS ConnectionState &GetConnectionState();
   RT_API_ATTRS ExternalFileUnit *GetExternalFileUnit() const;
   RT_API_ATTRS int EndIoStatement();
@@ -661,7 +644,6 @@ class ChildIoStatementState : public IoStatementBase,
 
 private:
   ChildIo &child_;
-  MutableModes mutableModes_;
 };
 
 template <Direction DIR, typename CHAR>
@@ -672,6 +654,7 @@ class ChildFormattedIoStatementState : public ChildIoStatementState<DIR>,
   RT_API_ATTRS ChildFormattedIoStatementState(ChildIo &, const CharType *format,
       std::size_t formatLength, const Descriptor *formatDescriptor = nullptr,
       const char *sourceFile = nullptr, int sourceLine = 0);
+  RT_API_ATTRS MutableModes &mutableModes() { return mutableModes_; }
   RT_API_ATTRS void CompleteOperation();
   RT_API_ATTRS int EndIoStatement();
   RT_API_ATTRS bool AdvanceRecord(int = 1);
@@ -681,6 +664,7 @@ class ChildFormattedIoStatementState : public ChildIoStatementState<DIR>,
   }
 
 private:
+  MutableModes mutableModes_;
   FormatControl<ChildFormattedIoStatementState> format_;
 };
 
@@ -856,7 +840,7 @@ class InquireUnconnectedFileState : public NoUnitIoStatementState {
 };
 
 class InquireIOLengthState : public NoUnitIoStatementState,
-                             public IoDirectionState<Direction::Output> {
+                             public OutputStatementState {
 public:
   RT_API_ATTRS InquireIOLengthState(
       const char *sourceFile = nullptr, int sourceLine = 0);

flang-rt/lib/runtime/descriptor-io.cpp

@@ -47,19 +47,15 @@ static RT_API_ATTRS Fortran::common::optional<bool> DefinedFormattedIo(
     const typeInfo::DerivedType &derived,
     const typeInfo::SpecialBinding &special,
     const SubscriptValue subscripts[]) {
-  // Look at the next data edit descriptor.  If this is list-directed I/O, the
-  // "maxRepeat=0" argument will prevent the input from advancing over an
-  // initial '(' that shouldn't be consumed now as the start of a real part.
-  Fortran::common::optional<DataEdit> peek{io.GetNextDataEdit(/*maxRepeat=*/0)};
+  Fortran::common::optional<DataEdit> peek{
+      io.GetNextDataEdit(0 /*to peek at it*/)};
   if (peek &&
       (peek->descriptor == DataEdit::DefinedDerivedType ||
-          peek->descriptor == DataEdit::ListDirected ||
-          peek->descriptor == DataEdit::ListDirectedRealPart)) {
+          peek->descriptor == DataEdit::ListDirected)) {
     // Defined formatting
     IoErrorHandler &handler{io.GetIoErrorHandler()};
-    DataEdit edit{peek->descriptor == DataEdit::ListDirectedRealPart
-            ? *peek
-            : *io.GetNextDataEdit(1)};
+    DataEdit edit{*io.GetNextDataEdit(1)}; // now consume it; no repeats
+    RUNTIME_CHECK(handler, edit.descriptor == peek->descriptor);
     char ioType[2 + edit.maxIoTypeChars];
     auto ioTypeLen{std::size_t{2} /*"DT"*/ + edit.ioTypeChars};
     if (edit.descriptor == DataEdit::DefinedDerivedType) {
@@ -840,23 +836,13 @@ template RT_API_ATTRS int DescriptorIoTicket<Direction::Input>::Continue(
 
 template <Direction DIR>
 RT_API_ATTRS bool DescriptorIO(IoStatementState &io,
-    const Descriptor &descriptor, const NonTbpDefinedIoTable *originalTable) {
+    const Descriptor &descriptor, const NonTbpDefinedIoTable *table) {
   bool anyIoTookPlace{false};
-  const NonTbpDefinedIoTable *defaultTable{io.nonTbpDefinedIoTable()};
-  const NonTbpDefinedIoTable *table{originalTable};
-  if (!table) {
-    table = defaultTable;
-  } else if (table != defaultTable) {
-    io.set_nonTbpDefinedIoTable(table); // for nested I/O
-  }
   WorkQueue workQueue{io.GetIoErrorHandler()};
   if (workQueue.BeginDescriptorIo<DIR>(io, descriptor, table, anyIoTookPlace) ==
       StatContinue) {
     workQueue.Run();
   }
-  if (defaultTable != table) {
-    io.set_nonTbpDefinedIoTable(defaultTable);
-  }
   return anyIoTookPlace;
 }
 

flang-rt/lib/runtime/edit-input.cpp

@@ -37,7 +37,9 @@ static RT_API_ATTRS bool CheckCompleteListDirectedField(
   if (edit.IsListDirected()) {
     std::size_t byteCount;
     if (auto ch{io.GetCurrentChar(byteCount)}) {
-      if (!IsCharValueSeparator(edit, *ch)) {
+      if (IsCharValueSeparator(edit, *ch)) {
+        return true;
+      } else {
         const auto &connection{io.GetConnectionState()};
         io.GetIoErrorHandler().SignalError(IostatBadListDirectedInputSeparator,
             "invalid character (0x%x) after list-directed input value, "
@@ -47,9 +49,12 @@ static RT_API_ATTRS bool CheckCompleteListDirectedField(
             static_cast<int>(connection.currentRecordNumber));
         return false;
       }
+    } else {
+      return true; // end of record: ok
     }
+  } else {
+    return true;
   }
-  return true;
 }
 
 template <int LOG2_BASE>
@@ -532,11 +537,9 @@ static RT_API_ATTRS ScannedRealInput ScanRealInput(
       io.SkipSpaces(remaining);
       next = io.NextInField(remaining, edit);
     }
-    if (!next || *next == ')') { // NextInField fails on separators like ')'
+    if (!next) { // NextInField fails on separators like ')'
       std::size_t byteCount{0};
-      if (!next) {
-        next = io.GetCurrentChar(byteCount);
-      }
+      next = io.GetCurrentChar(byteCount);
       if (next && *next == ')') {
         io.HandleRelativePosition(byteCount);
       }

flang-rt/lib/runtime/io-stmt.cpp

@@ -526,17 +526,6 @@ Fortran::common::optional<DataEdit> IoStatementState::GetNextDataEdit(int n) {
       [&](auto &x) { return x.get().GetNextDataEdit(*this, n); }, u_);
 }
 
-const NonTbpDefinedIoTable *IoStatementState::nonTbpDefinedIoTable() const {
-  return common::visit(
-      [&](auto &x) { return x.get().nonTbpDefinedIoTable(); }, u_);
-}
-
-void IoStatementState::set_nonTbpDefinedIoTable(
-    const NonTbpDefinedIoTable *table) {
-  common::visit(
-      [&](auto &x) { return x.get().set_nonTbpDefinedIoTable(table); }, u_);
-}
-
 bool IoStatementState::Emit(
     const char *data, std::size_t bytes, std::size_t elementBytes) {
   return common::visit(
@@ -644,10 +633,10 @@ IoStatementState::FastAsciiField IoStatementState::GetUpcomingFastAsciiField() {
   if (!connection.isUTF8 && connection.internalIoCharKind <= 1) {
     const char *p{nullptr};
     if (std::size_t bytes{GetNextInputBytes(p)}) {
-      return FastAsciiField{connection, p, bytes};
+      return FastAsciiField(connection, p, bytes);
     }
   }
-  return FastAsciiField{connection};
+  return FastAsciiField(connection);
 }
 
 Fortran::common::optional<char32_t> IoStatementState::NextInField(
@@ -931,12 +920,9 @@ ListDirectedStatementState<Direction::Input>::GetNextDataEdit(
       fastField.connection().positionInRecord = start;
     }
   }
-  if (!imaginaryPart_ && edit.descriptor == DataEdit::ListDirected && ch &&
-      *ch == '(') {
-    if (maxRepeat > 0) { // not being peeked at fram DefinedFormattedIo()
-      realPart_ = true;
-      fastField.connection().HandleRelativePosition(byteCount);
-    }
+  if (!imaginaryPart_ && ch && *ch == '(') {
+    realPart_ = true;
+    fastField.connection().HandleRelativePosition(byteCount);
     edit.descriptor = DataEdit::ListDirectedRealPart;
   }
   return edit;
@@ -966,24 +952,12 @@ bool ExternalUnformattedIoStatementState<DIR>::Receive(
 template <Direction DIR>
 ChildIoStatementState<DIR>::ChildIoStatementState(
     ChildIo &child, const char *sourceFile, int sourceLine)
-    : IoStatementBase{sourceFile, sourceLine}, child_{child},
-      mutableModes_{child.parent().mutableModes()} {}
-
-template <Direction DIR>
-const NonTbpDefinedIoTable *
-ChildIoStatementState<DIR>::nonTbpDefinedIoTable() const {
-#if !defined(RT_DEVICE_AVOID_RECURSION)
-  return child_.parent().nonTbpDefinedIoTable();
-#else
-  ReportUnsupportedChildIo();
-#endif
-}
+    : IoStatementBase{sourceFile, sourceLine}, child_{child} {}
 
 template <Direction DIR>
-void ChildIoStatementState<DIR>::set_nonTbpDefinedIoTable(
-    const NonTbpDefinedIoTable *table) {
+MutableModes &ChildIoStatementState<DIR>::mutableModes() {
 #if !defined(RT_DEVICE_AVOID_RECURSION)
-  child_.parent().set_nonTbpDefinedIoTable(table);
+  return child_.parent().mutableModes();
 #else
   ReportUnsupportedChildIo();
 #endif
@@ -1056,7 +1030,9 @@ ChildFormattedIoStatementState<DIR, CHAR>::ChildFormattedIoStatementState(
     ChildIo &child, const CHAR *format, std::size_t formatLength,
     const Descriptor *formatDescriptor, const char *sourceFile, int sourceLine)
     : ChildIoStatementState<DIR>{child, sourceFile, sourceLine},
-      format_{*this, format, formatLength, formatDescriptor} {}
+      mutableModes_{child.parent().mutableModes()}, format_{*this, format,
+                                                        formatLength,
+                                                        formatDescriptor} {}
 
 template <Direction DIR, typename CHAR>
 void ChildFormattedIoStatementState<DIR, CHAR>::CompleteOperation() {