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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4c0888f237f963ac476b27fd58a3356dacd14169..9133321d59be9a4bbe55a59e8eb82b49577c2bdf 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
+
+       * trans-array.c (gfc_conv_expr_descriptor): Simplify coarray
+       descriptor setup code. 
+
 2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
 
        * 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 37cdeb560ee7677997ee50c3d040f8f0636c5383..88849ef4a04e43602e37a268fdea6991d62a7958 100644 (file)
--- 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)