[flang-commits] [flang] 9fd03cb - [flang][runtime] Don't prematurely end formatted integer input (#76643)

[via flang-commits]

Author: Peter Klausler
Date: 2024-01-02T09:49:50-08:00
New Revision: 9fd03cb6522ac1469512502713bedf8b352e2589

URL: https://github.com/llvm/llvm-project/commit/9fd03cb6522ac1469512502713bedf8b352e2589
DIFF: https://github.com/llvm/llvm-project/commit/9fd03cb6522ac1469512502713bedf8b352e2589.diff

LOG: [flang][runtime] Don't prematurely end formatted integer input (#76643)

When an input data-list has more items than can be read by a format from
the input record (e.g., "(4I5)" reading "1 2"), don't return false from
EditIntegerInput() just because nothing was read -- that will prevent
later items from being set to zero, as they should be. Return true
unless nothing was read and there is some kind of error pending.

Fixes llvm-error-tests/Fortran/gfortran/regression/pr478478.f90.

Added: 
    

Modified: 
    flang/runtime/edit-input.cpp

Removed: 
    


################################################################################
diff  --git a/flang/runtime/edit-input.cpp b/flang/runtime/edit-input.cpp
index 0c2341a4dfac7b..6d4fa588cbf60d 100644
--- a/flang/runtime/edit-input.cpp
+++ b/flang/runtime/edit-input.cpp
@@ -244,7 +244,7 @@ bool EditIntegerInput(
   if (sign == '-') {
     value = -value;
   }
-  if (any || !io.GetConnectionState().IsAtEOF()) {
+  if (any || !io.GetIoErrorHandler().InError()) {
     // The value is stored in the lower order bits on big endian platform.
     // When memcpy, shift the value to the higher order bit.
     auto shft{static_cast<int>(sizeof(value.low())) - kind};
@@ -255,8 +255,10 @@ bool EditIntegerInput(
     } else {
       std::memcpy(n, &value, kind); // a blank field means zero
     }
+    return true;
+  } else {
+    return false;
   }
-  return any;
 }
 
 // Parses a REAL input number from the input source as a normalized