re PR fortran/35960 (run time abort with assignment of RESHAPEd zero sized array)

2008-04-25  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR libfortran/35960
	* m4/reshape.m4:  Fix typo in last commit.
	* generated/reshape_i4.c:  Regererated.
	* generated/reshape_i8.c:  Regenerated.
	* generated/reshape_i16.c:  Regenerated.
	* generated/reshape_r4.c:  Regenerated.
	* generated/reshape_r8.c:  Regenerated.
	* generated/reshape_r10.c:  Regenerated.
	* generated/reshape_r16.c:  Regenerated.
	* generated/reshape_c4.c:  Regenerated.
	* generated/reshape_c8.c:  Regenerated.
	* generated/reshape_c10.c:  Regenerated.
	* generated/reshape_c16.c:  Regenerated.

From-SVN: r134677

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 9747c0e480d9b750a5e38ffd63abc3e9102074ac..df959f93544c6f65ec79d220960924f4efa7eb80 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,19 @@
+2008-04-25  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR libfortran/35960
+       * m4/reshape.m4:  Fix typo in last commit.
+       * generated/reshape_i4.c:  Regererated.
+       * generated/reshape_i8.c:  Regenerated.
+       * generated/reshape_i16.c:  Regenerated.
+       * generated/reshape_r4.c:  Regenerated.
+       * generated/reshape_r8.c:  Regenerated.
+       * generated/reshape_r10.c:  Regenerated.
+       * generated/reshape_r16.c:  Regenerated.
+       * generated/reshape_c4.c:  Regenerated.
+       * generated/reshape_c8.c:  Regenerated.
+       * generated/reshape_c10.c:  Regenerated.
+       * generated/reshape_c16.c:  Regenerated.
+
 2008-04-24  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        * intrinsics/time_1.h (__time_1): Remove unused variable.

diff --git a/libgfortran/generated/reshape_c10.c b/libgfortran/generated/reshape_c10.c
index 28cad4a0b6ed368eea8cc3ef20a9201aa39f5fa7..732d947a8da3aed58ab621dd870a8e0e9b6629f9 100644 (file)
--- a/libgfortran/generated/reshape_c10.c
+++ b/libgfortran/generated/reshape_c10.c
@@ -131,7 +131,7 @@ reshape_c10 (gfc_array_c10 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_c16.c b/libgfortran/generated/reshape_c16.c
index ce658dae66870d83004a4815f4d38adaf0460441..71532c929efb441e0d184e3a6946fca4f2197a61 100644 (file)
--- a/libgfortran/generated/reshape_c16.c
+++ b/libgfortran/generated/reshape_c16.c
@@ -131,7 +131,7 @@ reshape_c16 (gfc_array_c16 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_c4.c b/libgfortran/generated/reshape_c4.c
index fd33a954a06b8599eed2c0dd7d0551e4870e18de..4253b06681566c41d5e9ac7f421c87e00fbf3208 100644 (file)
--- a/libgfortran/generated/reshape_c4.c
+++ b/libgfortran/generated/reshape_c4.c
@@ -131,7 +131,7 @@ reshape_c4 (gfc_array_c4 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_c8.c b/libgfortran/generated/reshape_c8.c
index d23cf88c0a34b2011f769ed81a912c9f5b2a6cf4..add90f2f205c8105b8c99bfb4a0aa4ea03874768 100644 (file)
--- a/libgfortran/generated/reshape_c8.c
+++ b/libgfortran/generated/reshape_c8.c
@@ -131,7 +131,7 @@ reshape_c8 (gfc_array_c8 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_i16.c b/libgfortran/generated/reshape_i16.c
index c9b3694c5deb83ac4d05b44e48d3df6c1c38cc2d..e2d5a275842aad1c4a2250000ed326fc8e88ad6a 100644 (file)
--- a/libgfortran/generated/reshape_i16.c
+++ b/libgfortran/generated/reshape_i16.c
@@ -131,7 +131,7 @@ reshape_16 (gfc_array_i16 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_i4.c b/libgfortran/generated/reshape_i4.c
index 4a55b68fed6957fe3013921b0b5518a48c2bb29d..3e0c9d68542c1075d124386ce44ffc98da20af87 100644 (file)
--- a/libgfortran/generated/reshape_i4.c
+++ b/libgfortran/generated/reshape_i4.c
@@ -94,10 +94,10 @@ reshape_4 (gfc_array_i4 * const restrict ret,
     {
       shape_data[n] = shape->data[n * shape->dim[0].stride];
       if (shape_data[n] <= 0)
-       {
-          shape_data[n] = 0;
-         shape_empty = 1;
-        }
+      {
+        shape_data[n] = 0;
+       shape_empty = 1;
+      }
     }
 
   if (ret->data == NULL)
@@ -131,7 +131,7 @@ reshape_4 (gfc_array_i4 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_i8.c b/libgfortran/generated/reshape_i8.c
index d496ca9d7efc23afd806e70977140162e6ad4cc1..bf3185e1c2c3d9576dbd8deb13d511f028f31e84 100644 (file)
--- a/libgfortran/generated/reshape_i8.c
+++ b/libgfortran/generated/reshape_i8.c
@@ -131,7 +131,7 @@ reshape_8 (gfc_array_i8 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_r10.c b/libgfortran/generated/reshape_r10.c
index 61e367c96ce78769bf0c809c6d381297f65cdbfd..9f6159aeafb92e78d5eb0964e73910266385ae30 100644 (file)
--- a/libgfortran/generated/reshape_r10.c
+++ b/libgfortran/generated/reshape_r10.c
@@ -131,7 +131,7 @@ reshape_r10 (gfc_array_r10 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_r16.c b/libgfortran/generated/reshape_r16.c
index f04fe32c6a82a391b111734fed94c674d47b801c..69578f033a5ffd26b73d5f3136efa40492d79d20 100644 (file)
--- a/libgfortran/generated/reshape_r16.c
+++ b/libgfortran/generated/reshape_r16.c
@@ -131,7 +131,7 @@ reshape_r16 (gfc_array_r16 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_r4.c b/libgfortran/generated/reshape_r4.c
index 0323a7246242d884a227b5b15fa83a7072bfdcc0..112dbf2955d6c23b7e55f27a6a3f73e264da9593 100644 (file)
--- a/libgfortran/generated/reshape_r4.c
+++ b/libgfortran/generated/reshape_r4.c
@@ -131,7 +131,7 @@ reshape_r4 (gfc_array_r4 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/generated/reshape_r8.c b/libgfortran/generated/reshape_r8.c
index e6be1ef03be4b0b0258ba91f0f6b1f9bd534c766..015546ffe1a13d6e97bede4fa7efb3a99e68cec2 100644 (file)
--- a/libgfortran/generated/reshape_r8.c
+++ b/libgfortran/generated/reshape_r8.c
@@ -131,7 +131,7 @@ reshape_r8 (gfc_array_r8 * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");

diff --git a/libgfortran/m4/reshape.m4 b/libgfortran/m4/reshape.m4
index ed060ecb9ff155787379a13d19d38bdeea2058bd..a10ad7155840d4deb4f3014ccf54919e78891aa0 100644 (file)
--- a/libgfortran/m4/reshape.m4
+++ b/libgfortran/m4/reshape.m4
@@ -135,7 +135,7 @@ reshape_'rtype_ccode` ('rtype` * const restrict ret,
       rstride[n] = ret->dim[dim].stride;
       rextent[n] = ret->dim[dim].ubound + 1 - ret->dim[dim].lbound;
       if (rextent[n] < 0)
-        rextent[n] == 0;
+        rextent[n] = 0;
 
       if (rextent[n] != shape_data[dim])
         runtime_error ("shape and target do not conform");