diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2012-01-31 12:30:32 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2012-01-31 12:30:32 +0000 |
| commit | 458842fb3819b2c4c2289476084f045714dd4738 (patch) | |
| tree | dab4882108b8c0c3de2046b70b8c6c360b8aabf4 /gcc/fortran/trans-expr.c | |
| parent | a2be33be2436af63f81a55a83ee8e06694478c98 (diff) | |
| download | gcc-458842fb3819b2c4c2289476084f045714dd4738.zip gcc-458842fb3819b2c4c2289476084f045714dd4738.tar.gz gcc-458842fb3819b2c4c2289476084f045714dd4738.tar.bz2 | |
re PR fortran/52012 (Wrong-code with realloc on assignment and RESHAPE w/ ORDER=)
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-31 Paul Thomas <pault@gcc.gnu.org>
PR fortran/52012
* gfortran.dg/realloc_on_assign_10.f90: New test.
From-SVN: r183757
Diffstat (limited to 'gcc/fortran/trans-expr.c')
| -rw-r--r-- | gcc/fortran/trans-expr.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 7543149..657b4f4 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); } |