re PR libfortran/38225 (RESHAPE bounds with multi-dimensional SOURCE)

2008-11-22  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR libfortran/38225
	* intrinsics/reshape_generic.c (reshape_internal):
	Use all dimensions of source for bounds checking.
	* m4/reshape.m4:  Likewise.
	* generated/reshape_c10.c Regenerated.
	* generated/reshape_c16.c Regenerated.
	* generated/reshape_c4.c Regenerated.
	* generated/reshape_c8.c Regenerated.
	* generated/reshape_i16.c Regenerated.
	* generated/reshape_i4.c Regenerated.
	* generated/reshape_i8.c Regenerated.
	* generated/reshape_r10.c Regenerated.
	* generated/reshape_r16.c Regenerated.
	* generated/reshape_r4.c Regenerated.
	* generated/reshape_r8.c Regenerated.

2008-11-22  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR libfortran/38225
	* gfortran.dg/reshape_3.f90:  New test.

From-SVN: r142125

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3b5fae63cab6b5b15447bca576a4cb89a194afd5..8feb7befa894d70d79601b9d4840b6de8d9d1024 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-22  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR libfortran/38225
+       * gfortran.dg/reshape_3.f90:  New test.
+
 2008-11-22  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/38160

diff --git a/gcc/testsuite/gfortran.dg/reshape_3.f90 b/gcc/testsuite/gfortran.dg/reshape_3.f90
new file mode 100644 (file)
index 0000000..a9f44b4
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/reshape_3.f90
@@ -0,0 +1,12 @@
+! { dg-do run }
+! { dg-options "-fbounds-check" }
+program main
+  implicit none
+  integer, dimension(2,2) :: a4
+  integer(kind=1), dimension(2,2) :: a1
+  character(len=100) line
+  data a4 /1, 2, 3, 4/
+  a1 = a4
+  write (unit=line,fmt='(4I3)') reshape(a4,(/4/))
+  write (unit=line,fmt='(4I3)') reshape(a1,(/4/))
+end program main

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index f2d279db20c49c5bc19a2d9ae3fa33ff21f4bc17..7a176ee10e6a6f733d023abca9098315f73bbabd 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,21 @@
+2008-11-22  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR libfortran/38225
+       * intrinsics/reshape_generic.c (reshape_internal):
+       Use all dimensions of source for bounds checking.
+       * m4/reshape.m4:  Likewise.
+       * generated/reshape_c10.c Regenerated.
+       * generated/reshape_c16.c Regenerated.
+       * generated/reshape_c4.c Regenerated.
+       * generated/reshape_c8.c Regenerated.
+       * generated/reshape_i16.c Regenerated.
+       * generated/reshape_i4.c Regenerated.
+       * generated/reshape_i8.c Regenerated.
+       * generated/reshape_r10.c Regenerated.
+       * generated/reshape_r16.c Regenerated.
+       * generated/reshape_r4.c Regenerated.
+       * generated/reshape_r8.c Regenerated.
+
 2008-11-22  Jakub Jelinek  <jakub@redhat.com>
 
        PR libfortran/37839

diff --git a/libgfortran/generated/reshape_c10.c b/libgfortran/generated/reshape_c10.c
index 076ea592130dcbe261e0ca024360d6e98cd4bd20..33059948a64dc6c09cd632ecc9384f53d1c85d20 100644 (file)
--- a/libgfortran/generated/reshape_c10.c
+++ b/libgfortran/generated/reshape_c10.c
@@ -135,7 +135,14 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_c16.c b/libgfortran/generated/reshape_c16.c
index 968fb9c34ce88122f21f4cb9d847e2c82f491f68..3b026a5028b377b012353e7a4542cb99c801a114 100644 (file)
--- a/libgfortran/generated/reshape_c16.c
+++ b/libgfortran/generated/reshape_c16.c
@@ -135,7 +135,14 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_c4.c b/libgfortran/generated/reshape_c4.c
index 00c95e7787cc4420044fbcfe7d4ff8ded8e5b529..1c4740c7f0b49da10ff9c4e8dee26fd47cd9e210 100644 (file)
--- a/libgfortran/generated/reshape_c4.c
+++ b/libgfortran/generated/reshape_c4.c
@@ -135,7 +135,14 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_c8.c b/libgfortran/generated/reshape_c8.c
index 9d355a51370cdef820a030e76c1b2dd77bba566c..d68ea481ad3b0cda8820cf3f8e91eb781dd7d2fa 100644 (file)
--- a/libgfortran/generated/reshape_c8.c
+++ b/libgfortran/generated/reshape_c8.c
@@ -135,7 +135,14 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_i16.c b/libgfortran/generated/reshape_i16.c
index 2888511556974ca3214c206023c510715bee6006..f46d7586dfc2bff7c13321de51a14f031af04126 100644 (file)
--- a/libgfortran/generated/reshape_i16.c
+++ b/libgfortran/generated/reshape_i16.c
@@ -135,7 +135,14 @@ reshape_16 (gfc_array_i16 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c
index 021ecfbc314a43c55972fc1afd674a36972d749d..d868c936cc28ca430dca1eafe415e3d2950c5eae 100644 (file)
--- a/libgfortran/generated/reshape_i4.c
+++ b/libgfortran/generated/reshape_i4.c
@@ -135,7 +135,14 @@ reshape_4 (gfc_array_i4 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c
index 9a2ce8d45ddf98d6457f4cdf979fdc4bf84439bb..bcd984f139750fa13fe1692292516a69e9abf123 100644 (file)
--- a/libgfortran/generated/reshape_i8.c
+++ b/libgfortran/generated/reshape_i8.c
@@ -135,7 +135,14 @@ reshape_8 (gfc_array_i8 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_r10.c b/libgfortran/generated/reshape_r10.c
index 100173f70d0c10ea90f4cd8a013df37c0084ff87..ac029593d98a1a761faed7130c71f5e92e633644 100644 (file)
--- a/libgfortran/generated/reshape_r10.c
+++ b/libgfortran/generated/reshape_r10.c
@@ -135,7 +135,14 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_r16.c b/libgfortran/generated/reshape_r16.c
index 8a344e0b6ba86c4223a7daf92a3603678dcce092..c12fab5c399baf1f97535347c05ddf5d02dfb80c 100644 (file)
--- a/libgfortran/generated/reshape_r16.c
+++ b/libgfortran/generated/reshape_r16.c
@@ -135,7 +135,14 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_r4.c b/libgfortran/generated/reshape_r4.c
index ea8c24a2b66ebf5d606e31174949619e6a158183..aa4bdec70d434a17f93d347fa7a97a0728696d18 100644 (file)
--- a/libgfortran/generated/reshape_r4.c
+++ b/libgfortran/generated/reshape_r4.c
@@ -135,7 +135,14 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/generated/reshape_r8.c b/libgfortran/generated/reshape_r8.c
index d8855e7874e60257cc93acca1a619b8262a4bf50..bacaaac05bccf2126b41ef2875c56f08017c2f0f 100644 (file)
--- a/libgfortran/generated/reshape_r8.c
+++ b/libgfortran/generated/reshape_r8.c
@@ -135,7 +135,14 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/intrinsics/reshape_generic.c b/libgfortran/intrinsics/reshape_generic.c
index 04b87271e9b502838623f91f6774ead44c84ec50..8e1fedb7a99c28e97f4dcf1c923baa777341d8ab 100644 (file)
--- a/libgfortran/intrinsics/reshape_generic.c
+++ b/libgfortran/intrinsics/reshape_generic.c
@@ -124,7 +124,14 @@ reshape_internal (parray *ret, parray *source, shape_type *shape,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"

diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4
index b7e321e3bb42a2dfd8ba940320b15030dad3dfb5..aa5d42960f7399b7f49eaa09fab31cc97f9541a1 100644 (file)
--- a/libgfortran/m4/reshape.m4
+++ b/libgfortran/m4/reshape.m4
@@ -139,7 +139,14 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
                          (long int) ret_extent, (long int) shape_data[n]);
        }
 
-      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+      source_extent = 1;
+      sdim = GFC_DESCRIPTOR_RANK (source);
+      for (n = 0; n < sdim; n++)
+       {
+         index_type se;
+         se = source->dim[n].ubound + 1 - source->dim[0].lbound;
+         source_extent *= se > 0 ? se : 0;
+       }
 
       if (rs < source_extent || (rs > source_extent && !pad))
        runtime_error("Incorrect size in SOURCE argument to RESHAPE"