diff options
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-expr.c | 28 |
2 files changed, 18 insertions, 16 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3fb70e0c12e..e836c0af382 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2012-01-31 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/52012 + * trans-expr.c (fcncall_realloc_result): Correct calculation of + result offset. + 2012-01-29 Janne Blomqvist <jb@gcc.gnu.org> * module.c (pointer_info): Make true_name and module pointers diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 7543149e32c..657b4f4fd5a 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -6310,16 +6310,11 @@ fcncall_realloc_result (gfc_se *se, int rank) gfc_add_modify (&se->post, desc, res_desc); offset = gfc_index_zero_node; - tmp = gfc_index_one_node; - /* Now reset the bounds from zero based to unity based. */ + + /* Now reset the bounds from zero based to unity based and set the + offset accordingly. */ for (n = 0 ; n < rank; n++) { - /* Accumulate the offset. */ - offset = fold_build2_loc (input_location, MINUS_EXPR, - gfc_array_index_type, - offset, tmp); - /* Now do the bounds. */ - gfc_conv_descriptor_offset_set (&se->post, desc, tmp); tmp = gfc_conv_descriptor_ubound_get (desc, gfc_rank_cst[n]); tmp = fold_build2_loc (input_location, PLUS_EXPR, gfc_array_index_type, @@ -6330,15 +6325,16 @@ fcncall_realloc_result (gfc_se *se, int rank) gfc_conv_descriptor_ubound_set (&se->post, desc, gfc_rank_cst[n], tmp); - /* The extent for the next contribution to offset. */ - tmp = fold_build2_loc (input_location, MINUS_EXPR, - gfc_array_index_type, - gfc_conv_descriptor_ubound_get (desc, gfc_rank_cst[n]), - gfc_conv_descriptor_lbound_get (desc, gfc_rank_cst[n])); - tmp = fold_build2_loc (input_location, PLUS_EXPR, - gfc_array_index_type, - tmp, gfc_index_one_node); + /* Accumulate the offset. Since all lbounds are unity, offset + is just minus the sum of the strides. */ + tmp = gfc_conv_descriptor_stride_get (desc, gfc_rank_cst[n]); + offset = fold_build2_loc (input_location, MINUS_EXPR, + gfc_array_index_type, + offset, tmp); + offset = gfc_evaluate_now (offset, &se->post); + } + gfc_conv_descriptor_offset_set (&se->post, desc, offset); } |