trans-array.c (gfc_trans_preloop_setup): Use loop's dimension instead of array's...

	* trans-array.c (gfc_trans_preloop_setup): Use loop's dimension instead
	of array's dimention. Check that it is indeed the same.

From-SVN: r180847

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7c36e109903fbe72b8c59d994a5a609e83b46f59..e800836679c0eed172fba6f1e5324153650ba9cc 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
+
+       * trans-array.c (gfc_trans_preloop_setup): Use loop's dimension instead
+       of array's dimention. Check that it is indeed the same.
+
 2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
 
        * trans-array.c (gfc_trans_preloop_setup): Remove redundant assertion.

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index f5e30ae4e7c47ca2821d92eec376f2aa8776abf8..476978e5cce6ae6d7a3f3f5f55dc9589956ea810 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -2861,13 +2861,14 @@ gfc_trans_preloop_setup (gfc_loopinfo * loop, int dim, int flag,
 
       if (dim >= info->dimen)
        continue;
+      gcc_assert (info->dimen == loop->dimen);
 
       if (info->ref)
        ar = &info->ref->u.ar;
       else
        ar = NULL;
 
-      if (dim == info->dimen - 1)
+      if (dim == loop->dimen - 1)
        i = 0;
       else
        i = dim + 1;
@@ -2876,7 +2877,7 @@ gfc_trans_preloop_setup (gfc_loopinfo * loop, int dim, int flag,
       gcc_assert (i == loop->order[i]);
       i = loop->order[i];
 
-      if (dim == info->dimen - 1)
+      if (dim == loop->dimen - 1)
        {
          stride = gfc_conv_array_stride (info->descriptor, info->dim[i]);