diff options
| author | Paul Thomas <pault@gcc.gnu.org> | 2007-08-13 06:16:03 +0000 |
|---|---|---|
| committer | Paul Thomas <pault@gcc.gnu.org> | 2007-08-13 06:16:03 +0000 |
| commit | 1229ece065d2312eab6f29e6a012fbb5c6ad6eae (patch) | |
| tree | 6cda691140c2048799e6ece3e64d23a216db0834 | |
| parent | d9acb717f1469f8fdee0a134cb046b22f5cacd10 (diff) | |
| download | gcc-1229ece065d2312eab6f29e6a012fbb5c6ad6eae.zip gcc-1229ece065d2312eab6f29e6a012fbb5c6ad6eae.tar.gz gcc-1229ece065d2312eab6f29e6a012fbb5c6ad6eae.tar.bz2 | |
re PR fortran/32962 (b = conjg(transpose(a)) is erroneous if b is an allocatable array)
2007-08-13 Paul Thomas <pault@gcc.gnu.org>
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 <pault@gcc.gnu.org>
PR fortran/32962
* gfortran.dg/transpose_1.f90: New test.
From-SVN: r127391
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/trans-array.c | 13 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/transpose_1.f90 | 27 |
4 files changed, 47 insertions, 4 deletions
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 <pault@gcc.gnu.org> + + 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 <fxcoudert@gcc.gnu.org> 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; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b039444..c5009c4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-08-13 Paul Thomas <pault@gcc.gnu.org> + + PR fortran/32962 + * gfortran.dg/transpose_1.f90: New test. + 2007-08-12 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> PR fortran/29600 diff --git a/gcc/testsuite/gfortran.dg/transpose_1.f90 b/gcc/testsuite/gfortran.dg/transpose_1.f90 new file mode 100644 index 0000000..9ad784e --- /dev/null +++ b/gcc/testsuite/gfortran.dg/transpose_1.f90 @@ -0,0 +1,27 @@ +! { dg-do compile } +! Tests the fix for PR32962, in which the result of TRANSPOSE, when +! an actual argument of an elemental intrinsic would receive the +! wrong offset. +! +! Contributed by Wirawan Purwanto <wirawan0@gmail.com> +! + real(kind=8), allocatable :: b(:,:) + real(kind=8) :: a(2,2), c(2,2) + i = 2 + allocate (b(i,i)) + a(1,1) = 2 + a(2,1) = 3 + a(1,2) = 7 + a(2,2) = 11 + call foo + call bar + if (any (c .ne. b)) call abort +contains + subroutine foo + b = cos(transpose(a)) + end subroutine + subroutine bar + c = transpose(a) + c = cos(c) + end subroutine +end program |