From 6cb0246c1bef48b03473e06697e2d22930c29df2 Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Fri, 7 Oct 2011 22:29:27 +0200 Subject: [PATCH] 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 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/trans-array.c | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6a0b284d10f..b72c0ebb50d 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2011-10-07 Mikael Morin + + * 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 * 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 87d5200813b..95ebf6c2359 100644 --- 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]; }