From 1229ece065d2312eab6f29e6a012fbb5c6ad6eae Mon Sep 17 00:00:00 2001 From: Paul Thomas Date: Mon, 13 Aug 2007 06:16:03 +0000 Subject: re PR fortran/32962 (b = conjg(transpose(a)) is erroneous if b is an allocatable array) 2007-08-13 Paul Thomas PR fortran/32962 * trans-array.c (gfc_conv_array_transpose): Set the offset of the destination to zero if the loop is zero based. 2007-08-13 Paul Thomas PR fortran/32962 * gfortran.dg/transpose_1.f90: New test. From-SVN: r127391 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-array.c | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 7ea4735..faa76ef 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2007-08-13 Paul Thomas + + PR fortran/32962 + * trans-array.c (gfc_conv_array_transpose): Set the offset + of the destination to zero if the loop is zero based. + 2007-08-12 Francois-Xavier Coudert PR fortran/29600 diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index 1cf00fd..31d177b 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -783,13 +783,18 @@ gfc_conv_array_transpose (gfc_se * se, gfc_expr * expr) dest_info->data = gfc_conv_descriptor_data_get (src); gfc_conv_descriptor_data_set (&se->pre, dest, dest_info->data); - /* Copy the offset. This is not changed by transposition: the top-left - element is still at the same offset as before. */ - dest_info->offset = gfc_conv_descriptor_offset (src); + /* Copy the offset. This is not changed by transposition; the top-left + element is still at the same offset as before, except where the loop + starts at zero. */ + if (!integer_zerop (loop->from[0])) + dest_info->offset = gfc_conv_descriptor_offset (src); + else + dest_info->offset = gfc_index_zero_node; + gfc_add_modify_expr (&se->pre, gfc_conv_descriptor_offset (dest), dest_info->offset); - + if (dest_info->dimen > loop->temp_dim) loop->temp_dim = dest_info->dimen; } -- cgit v1.1