2008-10-15 Thomas Koenig <tkoenig@gcc.gnu.org>

	PR libfortran/34670
	* intrinsics/reshape_generic.c:  Add 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.
        * generated/spread_r4.c: Regenerated.

2008-10-15  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR libfortran/34670
	* gfortran.dg/reshape_3.f90:  New test.
	* gfortran.dg/reshape_4.f90:  New test.
	* gfortran.dg/reshape_order_1.f90:  Use correct shape.
	* gfortran.dg/reshape_order_2.f90:  Likewise.
	* gfortran.dg/reshape_order_3.f90:  Likewise.
	* gfortran.dg/reshape_order_4.f90:  Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141144 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2647c9551086a091405afdeef7fe47c9c13df33b..8cee6d05feb7bcdeaff656fcf35204b817a9f460 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR libfortran/34670
+       * gfortran.dg/reshape_3.f90:  New test.
+       * gfortran.dg/reshape_4.f90:  New test.
+       * gfortran.dg/reshape_order_1.f90:  Use correct shape.
+       * gfortran.dg/reshape_order_2.f90:  Likewise.
+       * gfortran.dg/reshape_order_3.f90:  Likewise.
+       * gfortran.dg/reshape_order_4.f90:  Likewise.
+
 2008-10-15  Jan Sjodin  <jan.sjodin@amd.com>
            Harsha Jagasia  <harsha.jagasia@amd.com>
 

diff --git a/gcc/testsuite/gfortran.dg/reshape_order_1.f90 b/gcc/testsuite/gfortran.dg/reshape_order_1.f90
index 3909bfde22b63904df8f6567107f6f1c62cb0453..880d9d76b68232fa9c2892cc6be17d1b36166f2a 100644 (file)
--- a/gcc/testsuite/gfortran.dg/reshape_order_1.f90
+++ b/gcc/testsuite/gfortran.dg/reshape_order_1.f90
@@ -4,7 +4,7 @@
 program main
   implicit none
   integer(kind=1), dimension(6) :: source1 = (/ 1, 2, 3, 4, 5, 6 /)
-  integer, dimension(2) :: shape1 = (/ 2, 5/)
+  integer, dimension(2) :: shape1 = (/ 2, 3/)
   integer(kind=1), dimension(2) :: pad1 = (/ 0, 0/)
   character(len=200) :: l1, l2
   integer :: i1, i2

diff --git a/gcc/testsuite/gfortran.dg/reshape_order_2.f90 b/gcc/testsuite/gfortran.dg/reshape_order_2.f90
index 3c8ef411370e5cb1fba5f4645aa4b675acead98e..20a6f19b958d19b284511a98687e36fbabc50856 100644 (file)
--- a/gcc/testsuite/gfortran.dg/reshape_order_2.f90
+++ b/gcc/testsuite/gfortran.dg/reshape_order_2.f90
@@ -4,7 +4,7 @@
 program main
   implicit none
   integer(kind=1), dimension(6) :: source1 = (/ 1, 2, 3, 4, 5, 6 /)
-  integer, dimension(2) :: shape1 = (/ 2, 5/)
+  integer, dimension(2) :: shape1 = (/ 2, 3/)
   integer(kind=1), dimension(2) :: pad1 = (/ 0, 0/)
   character(len=200) :: l1, l2
   integer :: i1, i2

diff --git a/gcc/testsuite/gfortran.dg/reshape_order_3.f90 b/gcc/testsuite/gfortran.dg/reshape_order_3.f90
index 263488025d8cb07739498732e5749714c9d4f6fd..4b757f81cb4ce1168c223ee15ba7daa7ab0cdbd4 100644 (file)
--- a/gcc/testsuite/gfortran.dg/reshape_order_3.f90
+++ b/gcc/testsuite/gfortran.dg/reshape_order_3.f90
@@ -4,7 +4,7 @@
 program main
   implicit none
   integer(kind=4), dimension(6) :: source1 = (/ 1, 2, 3, 4, 5, 6 /)
-  integer, dimension(2) :: shape1 = (/ 2, 5/)
+  integer, dimension(2) :: shape1 = (/ 2, 3/)
   integer(kind=4), dimension(2) :: pad1 = (/ 0, 0/)
   character(len=200) :: l1, l2
   integer :: i1, i2

diff --git a/gcc/testsuite/gfortran.dg/reshape_order_4.f90 b/gcc/testsuite/gfortran.dg/reshape_order_4.f90
index bd0536d844ab4b31943f70d5dc9392176ebee2a2..c66df8e83d809cb971ecc38a4f2d2afe8e72fe6f 100644 (file)
--- a/gcc/testsuite/gfortran.dg/reshape_order_4.f90
+++ b/gcc/testsuite/gfortran.dg/reshape_order_4.f90
@@ -4,7 +4,7 @@
 program main
   implicit none
   integer(kind=4), dimension(6) :: source1 = (/ 1, 2, 3, 4, 5, 6 /)
-  integer, dimension(2) :: shape1 = (/ 2, 5/)
+  integer, dimension(2) :: shape1 = (/ 2, 3/)
   integer(kind=4), dimension(2) :: pad1 = (/ 0, 0/)
   character(len=200) :: l1, l2
   integer :: i1, i2

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 4e72cb8bfc7f814d885572d113410a5cfeb8839f..ae4e64e071a86b80fafde5e545e92a246fc819bf 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,21 @@
+2008-10-15  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR libfortran/34670
+       * intrinsics/reshape_generic.c:  Add 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.
+        * generated/spread_r4.c: Regenerated.
+
 2008-10-13  Jerry DeLisle  <jvdelisle@gcc.gnu.org
 
        PR libfortran/37083

diff --git a/libgfortran/generated/reshape_c10.c b/libgfortran/generated/reshape_c10.c
index ed54f1b637e7006b89fd2e82041a2eb7d218f11d..567d5b40283e3f5efcd6399426d015666230f9ce 100644 (file)
--- a/libgfortran/generated/reshape_c10.c
+++ b/libgfortran/generated/reshape_c10.c
@@ -121,6 +121,27 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_c16.c b/libgfortran/generated/reshape_c16.c
index 636150933a02e7cfca092c782c1bef95a9ec7f70..79745f2de5828fb9d19f799534b477efc6ae4f2b 100644 (file)
--- a/libgfortran/generated/reshape_c16.c
+++ b/libgfortran/generated/reshape_c16.c
@@ -121,6 +121,27 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_c4.c b/libgfortran/generated/reshape_c4.c
index 869d6231239600372b3bd055e68eebb30a0f2f49..90383adf922c98aa75edd95dc323302a4ea459e0 100644 (file)
--- a/libgfortran/generated/reshape_c4.c
+++ b/libgfortran/generated/reshape_c4.c
@@ -121,6 +121,27 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_c8.c b/libgfortran/generated/reshape_c8.c
index 24ec469bcab1199d4b8cba94a95110108a7a733c..49178e5e09adff25df608613ad117e5ad124a245 100644 (file)
--- a/libgfortran/generated/reshape_c8.c
+++ b/libgfortran/generated/reshape_c8.c
@@ -121,6 +121,27 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_i16.c b/libgfortran/generated/reshape_i16.c
index e857b6b6a2448aa1e1791ebba36ec71d272f2ffe..a626465136550fb2927370b05a8061d840d7f97d 100644 (file)
--- a/libgfortran/generated/reshape_i16.c
+++ b/libgfortran/generated/reshape_i16.c
@@ -121,6 +121,27 @@ reshape_16 (gfc_array_i16 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c
index 517d25d8703e8f2f22bb2c1b97bf22e070ed4112..1d3aa49e9470ea6ab7cb9b7069d03bdf3a05bb32 100644 (file)
--- a/libgfortran/generated/reshape_i4.c
+++ b/libgfortran/generated/reshape_i4.c
@@ -121,6 +121,27 @@ reshape_4 (gfc_array_i4 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c
index 75ba3197f34979d30354a34fb4a5bfae00f4f3f1..8c51795f1ff5c908ab933cdfc86cb23e693881e8 100644 (file)
--- a/libgfortran/generated/reshape_i8.c
+++ b/libgfortran/generated/reshape_i8.c
@@ -121,6 +121,27 @@ reshape_8 (gfc_array_i8 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_r10.c b/libgfortran/generated/reshape_r10.c
index 2987ef7a58c2eaf346a4a20c01372f8c07a61dca..846d12f1f0826fff43c3fe76a6ee30c400e7cf76 100644 (file)
--- a/libgfortran/generated/reshape_r10.c
+++ b/libgfortran/generated/reshape_r10.c
@@ -121,6 +121,27 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_r16.c b/libgfortran/generated/reshape_r16.c
index 2d84b2b8672767c6eee53892061dc4b503f85197..286e374ff18d40b0a54716169dcef7f3e99524ac 100644 (file)
--- a/libgfortran/generated/reshape_r16.c
+++ b/libgfortran/generated/reshape_r16.c
@@ -121,6 +121,27 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_r4.c b/libgfortran/generated/reshape_r4.c
index fa68f826dac7d53f056e8829a9e109528386ae34..cd16b24a9eb9c0744cfa4b79e15fabbd6e05fc3b 100644 (file)
--- a/libgfortran/generated/reshape_r4.c
+++ b/libgfortran/generated/reshape_r4.c
@@ -121,6 +121,27 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/reshape_r8.c b/libgfortran/generated/reshape_r8.c
index 8af573934391286460aea99ff75277a45fcf74c9..9da26d4c199413ec3ed27af5807cb65823f7f7ca 100644 (file)
--- a/libgfortran/generated/reshape_r8.c
+++ b/libgfortran/generated/reshape_r8.c
@@ -121,6 +121,27 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/generated/spread_r4.c b/libgfortran/generated/spread_r4.c
index c151df3122a0e0fd5e8324060889c38ac36f539a..a9357afdc61b83cc958e3d6d1708777402f5faea 100644 (file)
--- a/libgfortran/generated/spread_r4.c
+++ b/libgfortran/generated/spread_r4.c
@@ -131,7 +131,8 @@ spread_r4 (gfc_array_r4 *ret, const gfc_array_r4 *source,
              if (n == along - 1)
                {
                  rdelta = ret->dim[n].stride;
-
+                 printf("ret_extent = %ld, ncopies = %ld\n",
+                        (long int) ret_extent, (long int) ncopies);
                  if (ret_extent != ncopies)
                    runtime_error("Incorrect extent in return value of SPREAD"
                                  " intrinsic in dimension %ld: is %ld,"

diff --git a/libgfortran/intrinsics/reshape_generic.c b/libgfortran/intrinsics/reshape_generic.c
index 5abae82ca034c8eb3cd3f38c13df2bc0fba794f3..2d8306cbe31c14607a1867ebccad06e2974d7a93 100644 (file)
--- a/libgfortran/intrinsics/reshape_generic.c
+++ b/libgfortran/intrinsics/reshape_generic.c
@@ -110,6 +110,27 @@ reshape_internal (parray *ret, parray *source, shape_type *shape,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];

diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4
index 400e82cde6974fbf9617c05e853730c0ca7319f1..8d7ea728086b948e942654afae865d38793923ab 100644 (file)
--- a/libgfortran/m4/reshape.m4
+++ b/libgfortran/m4/reshape.m4
@@ -125,6 +125,27 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
 
   if (unlikely (compile_options.bounds_check))
     {
+      index_type ret_extent, source_extent;
+
+      rs = 1;
+      for (n = 0; n < rdim; n++)
+       {
+         rs *= shape_data[n];
+         ret_extent = ret->dim[n].ubound + 1 - ret->dim[n].lbound;
+         if (ret_extent != shape_data[n])
+           runtime_error("Incorrect extent in return value of RESHAPE"
+                         " intrinsic in dimension %ld: is %ld,"
+                         " should be %ld", (long int) n+1,
+                         (long int) ret_extent, (long int) shape_data[n]);
+       }
+
+      source_extent = source->dim[0].ubound + 1 - source->dim[0].lbound;
+
+      if (rs != source_extent)
+       runtime_error("Incorrect size in SOURCE argument to RESHAPE"
+                     " intrinsic: is %ld, should be %ld",
+                     (long int) source_extent, (long int) rs);
+
       if (order)
        {
          int seen[GFC_MAX_DIMENSIONS];