diff options
| author | Mikael Morin <mikael@gcc.gnu.org> | 2010-12-23 13:35:53 +0000 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2010-12-23 13:35:53 +0000 |
| commit | 2b63684b6e30bd1e0e33fe120566fd6298f4eea8 (patch) | |
| tree | c9a0ef27b56d8d5ae2f04fa3ce3409fbb0c3ac14 | |
| parent | 6961669f48aa18168b2d7daa7e2235fbec7cb636 (diff) | |
| download | gcc-2b63684b6e30bd1e0e33fe120566fd6298f4eea8.zip gcc-2b63684b6e30bd1e0e33fe120566fd6298f4eea8.tar.gz gcc-2b63684b6e30bd1e0e33fe120566fd6298f4eea8.tar.bz2 | |
re PR fortran/46978 (TRANSPOSE with RESHAPE and ALLOCATE: Segfault)
2010-12-23 Mikael Morin <mikael.morin@gcc.gnu.org>
PR fortran/46978
Revert part of revision 164112
* trans-array.c (gfc_trans_create_temp_array):
Set loop n'th upper bound from (possibly transposed) array's dim bounds.
From-SVN: r168206
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3c7b4f4..4ffb3e3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2010-12-23 Mikael Morin <mikael.morin@gcc.gnu.org> + + PR fortran/46978 + Revert part of revision 164112 + * trans-array.c (gfc_trans_create_temp_array): + Set loop n'th upper bound from (possibly transposed) array's dim bounds. + 2010-12-18 Tobias Burnus <burnus@net-b.de> PR fortran/46974 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 7ea84c7..4b8dd68 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -851,8 +851,8 @@ gfc_trans_create_temp_array (stmtblock_t * pre, stmtblock_t * post, of the descriptor fields. */ 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])); + gfc_conv_descriptor_ubound_get (desc, gfc_rank_cst[dim]), + gfc_conv_descriptor_lbound_get (desc, gfc_rank_cst[dim])); loop->to[n] = tmp; continue; } |