trans-array.c (gfc_conv_section_startstride): Remove coarray_last argument.

	* trans-array.c (gfc_conv_section_startstride): Remove coarray_last
	argument. Remove condition on coarray_last.
	(gfc_conv_ss_startstride): Update call to gfc_conv_section_startstride.
	(gfc_conv_expr_descriptor): Ditto.

From-SVN: r179692

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6a0b284d10fc28848b89bc804f0b7cf013c93f52..b72c0ebb50df1353b7f9eef67418c36a42f4689b 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
+
+       * trans-array.c (gfc_conv_section_startstride): Remove coarray_last
+       argument. Remove condition on coarray_last.
+       (gfc_conv_ss_startstride): Update call to gfc_conv_section_startstride.
+       (gfc_conv_expr_descriptor): Ditto.
+
 2011-10-07  Mikael Morin  <mikael.morin@sfr.fr>
 
        * trans-array.c (gfc_walk_variable_expr): Remove scalar coarray

diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 87d5200813b6ff7ce100c785e784ef4c8630a56c..95ebf6c235976bac6f705dc94c67bc523c839cfc 100644 (file)
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -3201,7 +3201,7 @@ evaluate_bound (stmtblock_t *block, tree *bounds, gfc_expr ** values,
 
 static void
 gfc_conv_section_startstride (gfc_loopinfo * loop, gfc_ss * ss, int dim,
-                             bool coarray, bool coarray_last)
+                             bool coarray)
 {
   gfc_expr *stride = NULL;
   tree desc;
@@ -3237,8 +3237,7 @@ gfc_conv_section_startstride (gfc_loopinfo * loop, gfc_ss * ss, int dim,
   /* Similarly calculate the end.  Although this is not used in the
      scalarizer, it is needed when checking bounds and where the end
      is an expression with side-effects.  */
-  if (!coarray_last)
-    evaluate_bound (&loop->pre, info->end, ar->end, desc, dim, false);
+  evaluate_bound (&loop->pre, info->end, ar->end, desc, dim, false);
 
   /* Calculate the stride.  */
   if (!coarray && stride == NULL)
@@ -3321,7 +3320,7 @@ done:
 
          for (n = 0; n < ss->data.info.dimen; n++)
            gfc_conv_section_startstride (loop, ss, ss->data.info.dim[n],
-                                         false, false);
+                                         false);
          break;
 
        case GFC_SS_INTRINSIC:
@@ -5976,7 +5975,7 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss)
          for (n = ss->data.info.dimen; n < ss->data.info.dimen + codim - 1;
               n++)
            {
-             gfc_conv_section_startstride (&loop, ss, n, true, false);
+             gfc_conv_section_startstride (&loop, ss, n, true);
              loop.from[n] = info->start[n];
              loop.to[n]   = info->end[n];
            }