From: Mikael Morin <mikael@gcc.gnu.org>
Date: Thu, 3 Nov 2011 20:49:14 +0000 (+0000)
Subject: trans-array.c (gfc_trans_preloop_setup): Factor loop index initialization.
X-Git-Tag: releases/gcc-4.7.0~2589
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f6d568e74a5392c6335384817470eebe52c2afd;p=thirdparty%2Fgcc.git

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 fb2123c25585..925183392ffd 100644
--- 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 91359e9c57ec..e3134f5efa9e 100644
--- 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)
 	{