re PR fortran/53029 (missed optimization in internal read (without implied-do-loop))

2017-05-29  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR libgfortran/53029
	* list_read.c (list_formatted_read_scala): Set the err return
	value to the common.flags error values.

	* gfortran.dg/read_5.f90: New test.

From-SVN: r248577

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4eb53a7ce1b8c70bcd43bb8befe73f170ac55328..58dd05b305585d3b63935ebd610dfe3dec8f8e9a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-29  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libgfortran/53029
+       * gfortran.dg/read_5.f90: New test.
+
 2017-05-29  Nathan Sidwell  <nathan@acm.org>
 
        PR c++/80891 (#4)

diff --git a/gcc/testsuite/gfortran.dg/read_5.f90 b/gcc/testsuite/gfortran.dg/read_5.f90
new file mode 100644 (file)
index 0000000..81f1f11
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/read_5.f90
@@ -0,0 +1,21 @@
+! { dg-do run }
+! PR53029 Missed optimization, this test case took several seconds to
+      program internalread
+      implicit none
+      integer m
+      parameter(m=1000000)
+      character value*10
+      character(80) :: result
+      integer i,j,intvalues(m)
+      real :: start, finish
+      intvalues = 33
+      call cpu_time(start)
+      do j=1,100
+        write(value,'(i3,a5)') j," 5 69"
+        read(value,*,end=20) intvalues
+   20   write(result,*) (intvalues(i),i=2,4)
+      if (result.ne.('           5          69          33')) call abort
+      call cpu_time(finish)
+      if ((finish-start).gt. 0.5) call abort
+      enddo
+      end program internalread

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index eaeac6ad0b7d03fc9fe0dd805a3b752f6fc278f3..e763232744d8a73dee5bc0760cfeb266092f05c7 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2017-05-29  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+       PR libgfortran/53029
+       * list_read.c (list_formatted_read_scala): Set the err return
+       value to the common.flags error values.
+
 2017-05-28  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * acinclude.m4 (LIBGFOR_CHECK_FMA3): Use test from

diff --git a/libgfortran/io/list_read.c b/libgfortran/io/list_read.c
index 6c00d11bf0537379074134876c4dae947cc944e1..b6cd66706bb079efbe9875a03b7bfec308e9b204 100644 (file)
--- a/libgfortran/io/list_read.c
+++ b/libgfortran/io/list_read.c
@@ -2298,11 +2298,16 @@ list_formatted_read_scalar (st_parameter_dt *dtp, bt type, void *p,
     free_saved (dtp);
 
 cleanup:
+  /* err may have been set above from finish_separator, so if it is set
+     trigger the hit_eof. The hit_eof will set bits in common.flags.  */
   if (err == LIBERROR_END)
     {
       free_line (dtp);
       hit_eof (dtp);
     }
+  /* Now we check common.flags for any errors that could have occurred in
+     a READ elsewhere such as in read_integer.  */
+  err = dtp->common.flags & IOPARM_LIBRETURN_MASK;
   fbuf_flush_list (dtp->u.p.current_unit, LIST_READING);
   return err;
 }