* trans.h (gfc_ss_info): Remove codimen field.
* trans-array.c (gfc_get_array_ss): Don't set codimen field.
(gfc_trans_create_temp_array): Don't set descriptor's cobounds.
(gfc_trans_constant_array_constructor): Update loop upper limit.
(gfc_conv_ss_startstride): Don't set codimen field.
Don't get descriptor's cobounds.
(gfc_walk_variable_expr): Update dimension index.
* trans-intrinsic.c (trans_this_image, trans_image_index,
conv_intrinsic_cobound): Don't set codimen field
From-SVN: r179690
2011-10-07 Mikael Morin <mikael.morin@sfr.fr>
+ * trans.h (gfc_ss_info): Remove codimen field.
+ * trans-array.c (gfc_get_array_ss): Don't set codimen field.
+ (gfc_trans_create_temp_array): Don't set descriptor's cobounds.
+ (gfc_trans_constant_array_constructor): Update loop upper limit.
+ (gfc_conv_ss_startstride): Don't set codimen field.
+ Don't get descriptor's cobounds.
+ (gfc_walk_variable_expr): Update dimension index.
+ * trans-intrinsic.c (trans_this_image, trans_image_index,
+ conv_intrinsic_cobound): Don't set codimen field
+
+2011-10-07 Mikael Morin <mikael.morin@sfr.fr>
+
* trans.h (gfc_loopinfo): Remove codimen field.
* trans-array.c (gfc_set_vector_loop_bounds,
gfc_trans_scalarizing_loops, gfc_conv_loop_setup): Update loop upper
2011-10-07 Mikael Morin <mikael.morin@sfr.fr>
* trans-array.c (gfc_conv_expr_descriptor): Simplify coarray
- descriptor setup code.
+ descriptor setup code.
2011-10-07 Mikael Morin <mikael.morin@sfr.fr>
ss->expr = expr;
info = &ss->data.info;
info->dimen = dimen;
- info->codimen = 0;
for (i = 0; i < info->dimen; i++)
info->dim[i] = i;
size, tmp);
size = gfc_evaluate_now (size, pre);
}
- for (n = info->dimen; n < info->dimen + info->codimen; n++)
- {
- gfc_conv_descriptor_lbound_set (pre, desc, gfc_rank_cst[n],
- gfc_index_zero_node);
- if (n < info->dimen + info->codimen - 1)
- gfc_conv_descriptor_ubound_set (pre, desc, gfc_rank_cst[n], loop->to[n]);
- }
/* Get the size of the array. */
info->data = gfc_build_addr_expr (NULL_TREE, tmp);
info->offset = gfc_index_zero_node;
- for (i = 0; i < info->dimen + info->codimen; i++)
+ for (i = 0; i < info->dimen; i++)
{
info->delta[i] = gfc_index_zero_node;
info->start[i] = gfc_index_zero_node;
for (n = 0; n < ss->data.info.dimen; n++)
gfc_conv_section_startstride (loop, ss, ss->data.info.dim[n],
false, false);
- for (n = ss->data.info.dimen;
- n < ss->data.info.dimen + ss->data.info.codimen; n++)
- gfc_conv_section_startstride (loop, ss, ss->data.info.dim[n], true,
- n == ss->data.info.dimen
- + ss->data.info.codimen -1);
-
break;
case GFC_SS_INTRINSIC:
case DIMEN_RANGE:
/* We don't add anything for sections, just remember this
dimension for later. */
- newss->data.info.dim[newss->data.info.dimen
- + newss->data.info.codimen] = n;
+ newss->data.info.dim[newss->data.info.dimen] = n;
if (n < ar->dimen)
newss->data.info.dimen++;
break;
1, GFC_SS_VECTOR);
indexss->loop_chain = gfc_ss_terminator;
newss->data.info.subscript[n] = indexss;
- newss->data.info.dim[newss->data.info.dimen
- + newss->data.info.codimen] = n;
+ newss->data.info.dim[newss->data.info.dimen] = n;
if (n < ar->dimen)
newss->data.info.dimen++;
break;
gfc_init_se (&argse, NULL);
ss = walk_coarray (expr->value.function.actual->expr);
gcc_assert (ss != gfc_ss_terminator);
- ss->data.info.codimen = corank;
argse.want_coarray = 1;
gfc_conv_expr_descriptor (&argse, expr->value.function.actual->expr, ss);
gfc_add_block_to_block (&se->pre, &argse.pre);
gfc_init_se (&argse, NULL);
ss = walk_coarray (expr->value.function.actual->expr);
gcc_assert (ss != gfc_ss_terminator);
- ss->data.info.codimen = corank;
argse.want_coarray = 1;
gfc_conv_expr_descriptor (&argse, expr->value.function.actual->expr, ss);
gfc_add_block_to_block (&se->pre, &argse.pre);
ss = walk_coarray (arg->expr);
gcc_assert (ss != gfc_ss_terminator);
- ss->data.info.codimen = corank;
gfc_init_se (&argse, NULL);
argse.want_coarray = 1;
typedef struct gfc_ss_info
{
- int dimen, codimen;
+ int dimen;
/* The ref that holds information on this section. */
gfc_ref *ref;
/* The descriptor of this array. */