[flang] Fix descriptor-based array data item I/O for list-directed CHARACTER & LOGICAL

[klausler]

Summary

These types have to distinguish list-directed I/O from formatted I/O,
and the subscript incrementation call was in the formatted branch
of the if() rather than after the if().

flang/runtime/descriptor-io.h

if (listOutput) {
         }
       } else {
         if (edit->descriptor != DataEdit::ListDirectedNullValue) {
           if (!EditDefaultCharacterInput(io, *edit, x, length)) {
             return false;
           }
         }
       }
-      if (!descriptor.IncrementSubscripts(subscripts) && j + 1 < numElements) {
-        io.GetIoErrorHandler().Crash(
-            "FormattedCharacterIO: subscripts out of bounds");
-      }
-    } else {
-      return false;
-    }
+    } else {
+      return false;
+    }
   }
   return true;
 }
 
 template <typename A, Direction DIR>
 inline bool FormattedLogicalIO(
     IoStatementState &io, const Descriptor &descriptor) {
   std::size_t numElements{descriptor.Elements()};
if (listOutput) {
           bool truth{};
           if (EditLogicalInput(io, *edit, truth)) {
             x = truth;
           } else {
             return false;
           }
         }
       }
-      if (!descriptor.IncrementSubscripts(subscripts) && j + 1 < numElements) {
-        io.GetIoErrorHandler().Crash(
-            "FormattedLogicalIO: subscripts out of bounds");
-      }
-    } else {
-      return false;
-    }
+    } else {
+      return false;
+    }
   }
   return true;
 }
 
 template <Direction DIR>
 static bool DescriptorIO(IoStatementState &io, const Descriptor &descriptor) {
   if (!io.get_if<IoDirectionState<DIR>>()) {
     io.GetIoErrorHandler().Crash(

flang/unittests/Runtime/hello.cpp

if (status) {
              << static_cast<int>(status) << '\n';
     } else if (std::strncmp(output, expect, 33) != 0) {
       Fail() << "Failed complex list-directed output, expected '" << expect
              << "', but got '" << output << "'\n";
     }
   }
 }
 
+static void descrOutputTest() {
+  char buffer[9];
+  // Formatted
+  const char *format{"(2A4)"};
+  auto cookie{IONAME(BeginInternalFormattedOutput)(
+      buffer, sizeof buffer, format, std::strlen(format))};
+  StaticDescriptor<1> staticDescriptor;
+  Descriptor &desc{staticDescriptor.descriptor()};
+  SubscriptValue extent[]{2};
+  char data[2][4];
+  std::memcpy(data[0], "ABCD", 4);
+  std::memcpy(data[1], "EFGH", 4);
+  desc.Establish(TypeCode{CFI_type_char}, sizeof data[0], &data, 1, extent);
+  desc.Dump();
+  desc.Check();
+  IONAME(OutputDescriptor)(cookie, desc);
+  if (auto status{IONAME(EndIoStatement)(cookie)}) {
+    Fail() << "descrOutputTest: '" << format << "' failed, status "
+           << static_cast<int>(status) << '\n';
+  } else {
+    test("descrOutputTest(formatted)", "ABCDEFGH ",
+        std::string{buffer, sizeof buffer});
+  }
+  // List-directed
+  cookie = IONAME(BeginInternalListOutput)(buffer, sizeof buffer);
+  IONAME(OutputDescriptor)(cookie, desc);
+  if (auto status{IONAME(EndIoStatement)(cookie)}) {
+    Fail() << "descrOutputTest: list-directed failed, status "
+           << static_cast<int>(status) << '\n';
+  } else {
+    test("descrOutputTest(list)", " ABCDEFGH",
+        std::string{buffer, sizeof buffer});
+  }
+}
+
 static void realTest(const char *format, double x, const char *expect) {
   char buffer[800];
   auto cookie{IONAME(BeginInternalFormattedOutput)(
       buffer, sizeof buffer, format, std::strlen(format))};
   IONAME(OutputReal64)(cookie, x);
   if (auto status{IONAME(EndIoStatement)(cookie)}) {
     Fail() << '\'' << format << "' failed, status " << static_cast<int>(status)
            << '\n';
int main() {
   realInTest("(F18.3)", "               125", 0x3fc0000000000000);
   realInTest("(-1P,F18.0)", "               125", 0x4093880000000000); // 1250
   realInTest("(1P,F18.0)", "               125", 0x4029000000000000); // 12.5
   realInTest("(BZ,F18.0)", "              125 ", 0x4093880000000000); // 1250
   realInTest("(BZ,F18.0)", "       125 . e +1 ", 0x42a6bcc41e900000); // 1.25e13
   realInTest("(DC,F18.0)", "              12,5", 0x4029000000000000);
 
   listInputTest();
+  descrOutputTest();
 
   return EndTests();
 }