Commit 6cb0246c by Mikael Morin Committed by Mikael Morin

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
parent d7baf647
2011-10-07 Mikael Morin <mikael.morin@sfr.fr> 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 * trans-array.c (gfc_walk_variable_expr): Remove scalar coarray
handling. Don't reset array ref's corank and codimensions' types handling. Don't reset array ref's corank and codimensions' types
in the full array ref case. Update loop upper limit. in the full array ref case. Update loop upper limit.
......
...@@ -3201,7 +3201,7 @@ evaluate_bound (stmtblock_t *block, tree *bounds, gfc_expr ** values, ...@@ -3201,7 +3201,7 @@ evaluate_bound (stmtblock_t *block, tree *bounds, gfc_expr ** values,
static void static void
gfc_conv_section_startstride (gfc_loopinfo * loop, gfc_ss * ss, int dim, gfc_conv_section_startstride (gfc_loopinfo * loop, gfc_ss * ss, int dim,
bool coarray, bool coarray_last) bool coarray)
{ {
gfc_expr *stride = NULL; gfc_expr *stride = NULL;
tree desc; tree desc;
...@@ -3237,8 +3237,7 @@ gfc_conv_section_startstride (gfc_loopinfo * loop, gfc_ss * ss, int dim, ...@@ -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 /* Similarly calculate the end. Although this is not used in the
scalarizer, it is needed when checking bounds and where the end scalarizer, it is needed when checking bounds and where the end
is an expression with side-effects. */ 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. */ /* Calculate the stride. */
if (!coarray && stride == NULL) if (!coarray && stride == NULL)
...@@ -3321,7 +3320,7 @@ done: ...@@ -3321,7 +3320,7 @@ done:
for (n = 0; n < ss->data.info.dimen; n++) for (n = 0; n < ss->data.info.dimen; n++)
gfc_conv_section_startstride (loop, ss, ss->data.info.dim[n], gfc_conv_section_startstride (loop, ss, ss->data.info.dim[n],
false, false); false);
break; break;
case GFC_SS_INTRINSIC: case GFC_SS_INTRINSIC:
...@@ -5976,7 +5975,7 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss) ...@@ -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; for (n = ss->data.info.dimen; n < ss->data.info.dimen + codim - 1;
n++) 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.from[n] = info->start[n];
loop.to[n] = info->end[n]; loop.to[n] = info->end[n];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment