:ADDPATCH fortran:

Hello world,

this one-liner fixes PR 31196, where reshape of a
transposed array led to silent wrong results.

Currently regtesting on i686-pc-linux-gnu.  OK for 4.3
if this passes?  OK for 4.2?

Thomas

2007-03-24  Thomas Koenig  <[EMAIL PROTECTED]>

        * intrinsic/reshape_generic.c (reshape_internal):  Increment
        correct variable.

! { dg-do run }
! PR 31196 - reshape of transposed derived types generated
!            wront results.
program main
  implicit none
  TYPE datatype
     INTEGER :: I
  END TYPE datatype
  character (len=20) line1, line2
  TYPE(datatype), dimension(2,2) :: data, result
  data(1,1)%i = 1
  data(2,1)%i = 2
  data(1,2)%i = 3
  data(2,2)%i = 4
  write (unit=line1, fmt="(4I4)") reshape(transpose(data),shape(data))
  write (unit=line2, fmt="(4I4)") (/ 1, 3, 2, 4 /)
  if (line1 /= line2) call abort
END program main
Index: intrinsics/reshape_generic.c
===================================================================
--- intrinsics/reshape_generic.c	(revision 123028)
+++ intrinsics/reshape_generic.c	(working copy)
@@ -266,7 +266,7 @@ reshape_internal (parray *ret, parray *s
           else
             {
               scount[n]++;
-              sptr += sstride[n] * size;
+              src += sstride[n] * size;
             }
         }
     }

Reply via email to