trans-array.c (gfc_trans_preloop_setup): Factor loop index initialization.

	* trans-array.c (gfc_trans_preloop_setup): Factor loop index
	initialization.

From-SVN: r180844

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index fb2123c255857ec7defe2fd183e2f2f56d181855..925183392ffd92393c7e06d1638c3a085cee62c7 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): Factor loop index
+       initialization.
+
 2011-11-03  Mikael Morin  <mikael@gcc.gnu.org>
 
        * trans-array.c (gfc_trans_preloop_setup): Move code earlier.

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 91359e9c57ec922bde8d7984154267f523d66ef5..e3134f5efa9e485d0f99cc2205a105a5d2a9aa53 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -2863,16 +2863,15 @@ gfc_trans_preloop_setup (gfc_loopinfo * loop, int dim, int flag,
        continue;
 
       if (info->ref)
-       {
-         ar = &info->ref->u.ar;
-         i = loop->order[dim + 1];
-       }
+       ar = &info->ref->u.ar;
       else
-       {
-         ar = NULL;
-         i = dim + 1;
-       }
+       ar = NULL;
+
+      i = dim + 1;
 
+      /* For the time being, there is no loop reordering.  */
+      gcc_assert (i == loop->order[i]);
+      i = loop->order[i];
 
       if (dim == info->dimen - 1)
        {