re PR libfortran/22142 ([4.0 only] eoshift: boundary not filled in correctly)

2005-06-28  Thomas Koenig  <Thomas.Koenig@online.de>

        PR libfortran/22142
        * m4/eoshift1.m4:  Correct bstride (it needs to be multiplied
        by size since it's a char pointer).
        * m4/eoshift1_4.c:  Regenerated.
        * m4/eoshift1_8.c:  Regenerated.

2005-06-28  Thomas Koenig  <Thomas.Koenig@online.de>

        PR libfortran/22142
        * gfortran.fortran-torture/execute/intrinsic_eoshift.f90:
        Add testcase also testing eoshift1 for PR 22142.

From-SVN: r101398

gcc/testsuite/ChangeLog

+2005-06-28  Thomas Koenig  <Thomas.Koenig@online.de>
+
+        PR libfortran/22142
+	* gfortran.fortran-torture/execute/intrinsic_eoshift.f90:
+	Add testcase also testing eoshift1 for PR 22142.
+
 2005-06-28  Richard Henderson  <rth@redhat.com>
 
 	* gcc.dg/tree-ssa/20030708-1.c: Remove static from test function.

gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_eoshift.f90

@@ -37,6 +37,12 @@ program intrinsic_eoshift
    if (any (a .ne. reshape ((/99, -1, 42, 99, -1, 42, 1, 2, 3/), (/3, 3/)))) &
       call abort
 
+   a = reshape ((/1, 2, 3, 4, 5, 6, 7, 8, 9/), (/3, 3/))
+   bo = (/99, -1, 42/)
+   a = eoshift (a, -2, bo, 2)
+   if (any (a .ne. reshape ((/99, -1, 42, 99, -1, 42, 1, 2, 3/), (/3, 3/)))) &
+      call abort
+
    ! Array shift and array bound.
    a = reshape ((/1, 2, 3, 4, 5, 6, 7, 8, 9/), (/3, 3/))
    a = eoshift (a, (/1, 0, -1/), (/99, -1, 42/), 1)

libgfortran/ChangeLog

 2005-06-28  Thomas Koenig  <Thomas.Koenig@online.de>
 
 	PR libfortran/22142
+	* m4/eoshift1.m4:  Correct bstride (it needs to be multiplied
+	by size since it's a char pointer).
+	* m4/eoshift1_4.c:  Regenerated.
+	* m4/eoshift1_8.c:  Regenerated.
+
+2005-06-28  Thomas Koenig  <Thomas.Koenig@online.de>
+
+	PR libfortran/22142
 	* m4/eoshift3.m4:  Correct bstride (it needs to be multiplied
 	by size since it's a char pointer).
 	* m4/eoshift3_4.c:  Regenerated.

libgfortran/generated/eoshift1_4.c

@@ -135,7 +135,7 @@ eoshift1_4 (gfc_array_char *ret,
           rstride[n] = ret->dim[dim].stride * size;
           sstride[n] = array->dim[dim].stride * size;
 
-          hstride[n] = h->dim[n].stride;
+          hstride[n] = h->dim[n].stride * size;
           n++;
         }
     }

libgfortran/generated/eoshift1_8.c

@@ -135,7 +135,7 @@ eoshift1_8 (gfc_array_char *ret,
           rstride[n] = ret->dim[dim].stride * size;
           sstride[n] = array->dim[dim].stride * size;
 
-          hstride[n] = h->dim[n].stride;
+          hstride[n] = h->dim[n].stride * size;
           n++;
         }
     }

libgfortran/m4/eoshift1.m4

@@ -136,7 +136,7 @@ eoshift1_`'atype_kind (gfc_array_char *ret,
           rstride[n] = ret->dim[dim].stride * size;
           sstride[n] = array->dim[dim].stride * size;
 
-          hstride[n] = h->dim[n].stride;
+          hstride[n] = h->dim[n].stride * size;
           n++;
         }
     }