From 7f6d568e74a5392c6335384817470eebe52c2afd Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Thu, 3 Nov 2011 20:49:14 +0000 Subject: [PATCH] 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 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/trans-array.c | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fb2123c2558..925183392ff 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2011-11-03 Mikael Morin + + * trans-array.c (gfc_trans_preloop_setup): Factor loop index + initialization. + 2011-11-03 Mikael Morin * 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 91359e9c57e..e3134f5efa9 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) { -- 2.30.2