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

13 files changed, 32 insertions, 16 deletions

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 9747c0e..df959f9 100644
--- 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 28cad4a..732d947 100644
--- 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 ce658da..71532c9 100644
--- 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 fd33a95..4253b06 100644
--- 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 d23cf88..add90f2 100644
--- 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 c9b3694..e2d5a27 100644
--- 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 4a55b68..3e0c9d6 100644
--- 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 d496ca9..bf3185e 100644
--- 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 61e367c..9f6159a 100644
--- 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 f04fe32..69578f0 100644
--- 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 0323a72..112dbf2 100644
--- 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 e6be1ef..015546f 100644
--- 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 ed060ec..a10ad71 100644
--- 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");