From: Alessandro Fanfarillo <fanfarillo.gcc@gmail.com>
Date: Thu, 26 Jul 2012 08:35:55 +0000 (-0600)
Subject: module.c (mio_array_spec): Don't read as->lower for assumed-rank arrays.
X-Git-Tag: releases/gcc-4.8.0~4262
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b573c9d6f4a2e4692492894266d1d936b8bd35af;p=thirdparty%2Fgcc.git

module.c (mio_array_spec): Don't read as->lower for assumed-rank arrays.

2012-07-26  Alessandro Fanfarillo  <fanfarillo.gcc@gmail.com>
            Tobias Burnus  <burnus@net-b.de>

        * module.c (mio_array_spec): Don't read as->lower for
        assumed-rank arrays.


Co-Authored-By: Tobias Burnus <burnus@net-b.de>

From-SVN: r189881
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index da86834bde42..136f504bfea5 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-26  Alessandro Fanfarillo  <fanfarillo.gcc@gmail.com>
+	    Tobias Burnus  <burnus@net-b.de>
+
+	* module.c (mio_array_spec): Don't read as->lower for
+	assumed-rank arrays.
+
 2012-07-25  Tobias Burnus  <burnus@net-b.de>
 
 	* trans-types.c (gfc_real16_is_float128): Fix spelling
diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c
index a3b90885f7cc..a4ff19980366 100644
--- a/gcc/fortran/module.c
+++ b/gcc/fortran/module.c
@@ -2359,9 +2359,15 @@ mio_array_spec (gfc_array_spec **asp)
 
   if (iomode == IO_OUTPUT)
     {
+      int rank;
+
       if (*asp == NULL)
 	goto done;
       as = *asp;
+
+      /* mio_integer expects nonnegative values.  */
+      rank = as->rank > 0 ? as->rank : 0;
+      mio_integer (&rank);
     }
   else
     {
@@ -2372,20 +2378,23 @@ mio_array_spec (gfc_array_spec **asp)
 	}
 
       *asp = as = gfc_get_array_spec ();
+      mio_integer (&as->rank);
     }
 
-  mio_integer (&as->rank);
   mio_integer (&as->corank);
   as->type = MIO_NAME (array_type) (as->type, array_spec_types);
 
+  if (iomode == IO_INPUT && as->type == AS_ASSUMED_RANK)
+    as->rank = -1;
   if (iomode == IO_INPUT && as->corank)
     as->cotype = (as->type == AS_DEFERRED) ? AS_DEFERRED : AS_EXPLICIT;
 
-  for (i = 0; i < as->rank + as->corank; i++)
-    {
-      mio_expr (&as->lower[i]);
-      mio_expr (&as->upper[i]);
-    }
+  if (as->rank > 0)
+    for (i = 0; i < as->rank + as->corank; i++)
+      {
+	mio_expr (&as->lower[i]);
+	mio_expr (&as->upper[i]);
+      }
 
 done:
   mio_rparen ();