From e97b61c26e4870f5b761a9dd4cc3cdb2c00609a8 Mon Sep 17 00:00:00 2001 From: Mikael Morin Date: Thu, 8 Sep 2011 17:40:48 +0200 Subject: [PATCH] trans-array.c (gfc_trans_constant_array_constructor): Remove superfluous initialisation of DIM field. 2011-09-08 Mikael Morin * trans-array.c (gfc_trans_constant_array_constructor): Remove superfluous initialisation of DIM field. (gfc_trans_array_constructor): Assert that DIMEN field is properly set. (gfc_conv_expr_descriptor): Ditto. * trans-expr.c (gfc_conv_procedure_call): Ditto. From-SVN: r178698 --- gcc/fortran/ChangeLog | 8 ++++++++ gcc/fortran/trans-array.c | 5 ++--- gcc/fortran/trans-expr.c | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index eb03a866e69..e3ae236b2cb 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2011-09-08 Mikael Morin + + * trans-array.c (gfc_trans_constant_array_constructor): Remove + superfluous initialisation of DIM field. + (gfc_trans_array_constructor): Assert that DIMEN field is properly set. + (gfc_conv_expr_descriptor): Ditto. + * trans-expr.c (gfc_conv_procedure_call): Ditto. + 2011-09-08 Mikael Morin * trans-array.h (gfc_get_scalar_ss): New prototype. diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 80a6fe67467..37cdeb560ee 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -1882,7 +1882,6 @@ gfc_trans_constant_array_constructor (gfc_loopinfo * loop, info->start[i] = gfc_index_zero_node; info->end[i] = gfc_index_zero_node; info->stride[i] = gfc_index_one_node; - info->dim[i] = i; } if (info->dimen > loop->temp_dim) @@ -1961,7 +1960,7 @@ gfc_trans_array_constructor (gfc_loopinfo * loop, gfc_ss * ss, locus * where) first_len = true; } - ss->data.info.dimen = loop->dimen; + gcc_assert (ss->data.info.dimen == loop->dimen); c = ss->expr->value.constructor; if (ss->expr->ts.type == BT_CHARACTER) @@ -5915,7 +5914,7 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss) loop.dimen); se->string_length = loop.temp_ss->string_length; - loop.temp_ss->data.temp.dimen = loop.dimen; + gcc_assert (loop.temp_ss->data.temp.dimen == loop.dimen); loop.temp_ss->data.temp.codimen = loop.codimen; gfc_add_ss_to_loop (&loop, loop.temp_ss); } diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 6a337191fc9..131927ce2a6 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -3576,7 +3576,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, /* Set the type of the array. */ tmp = gfc_typenode_for_spec (&comp->ts); - info->dimen = se->loop->dimen; + gcc_assert (info->dimen == se->loop->dimen); /* Evaluate the bounds of the result, if known. */ gfc_set_loop_bounds_from_array_spec (&mapping, se, comp->as); @@ -3611,7 +3611,7 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym, /* Set the type of the array. */ tmp = gfc_typenode_for_spec (&ts); - info->dimen = se->loop->dimen; + gcc_assert (info->dimen == se->loop->dimen); /* Evaluate the bounds of the result, if known. */ gfc_set_loop_bounds_from_array_spec (&mapping, se, sym->result->as); -- 2.30.2