From bb033c9adcbca5fb3dc60566e879e85d5190d696 Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Fri, 7 Oct 2011 21:11:01 +0200 Subject: [PATCH] trans-array.c (gfc_conv_expr_descriptor): Simplify coarray descriptor setup code. * trans-array.c (gfc_conv_expr_descriptor): Simplify coarray descriptor setup code. From-SVN: r179674 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/trans-array.c | 17 ++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 4c0888f237f..9133321d59b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2011-10-07 Mikael Morin + + * trans-array.c (gfc_conv_expr_descriptor): Simplify coarray + descriptor setup code. + 2011-10-07 Mikael Morin * resolve.c (compare_spec_to_ref): Move coarray ref initialization diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 37cdeb560ee..88849ef4a04 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -6140,22 +6140,13 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss) for (n = ndim; n < ndim + codim; n++) { - /* look for the corresponding scalarizer dimension: dim. */ - for (dim = 0; dim < ndim + codim; dim++) - if (info->dim[dim] == n) - break; - - /* loop exited early: the DIM being looked for has been found. */ - gcc_assert (dim < ndim + codim); - - from = loop.from[dim]; - to = loop.to[dim]; + from = loop.from[n]; + to = loop.to[n]; gfc_conv_descriptor_lbound_set (&loop.pre, parm, - gfc_rank_cst[dim], from); + gfc_rank_cst[n], from); if (n < ndim + codim - 1) gfc_conv_descriptor_ubound_set (&loop.pre, parm, - gfc_rank_cst[dim], to); - dim++; + gfc_rank_cst[n], to); } if (se->data_not_needed) -- 2.30.2