[Bug libfortran/22142] New: eoshift: boundary not filled in correctly

[Bug libfortran/22142] New: eoshift: boundary not filled in correctly

[tkoenig at gcc dot gnu dot org]

Another corner case of eoshift that's not correct...
in eoshift3, this time.

$ cat eoshift.f90
program main
  implicit none
  integer, dimension (3,3) :: a, b, w
  integer, dimension (3) :: bo, sh
  integer :: i,j

  a = reshape((/(i,i=1,9)/),shape(a))
  sh = (/ 3, -1, -3 /)
  bo = (/-999, -99, -9 /)
  b = eoshift(a, shift=sh, boundary=bo)
  w = reshape((/ -999, -999, -999, -99, 4, 5, -9, -9, -9 /), shape(b))
  do j=1,3
    do i=1,3
      if (w(i,j) /= b(i,j)) print *,i,j,w(i,j),b(i,j)
    end do
  end do
end program main
$ gfortran eoshift.f90
$ ./a.out
           1           2         -99 -1644167172
           1           3          -9    -6422529
           2           3          -9    -6422529
           3           3          -9    -6422529
$ gfortran -v
Using built-in specs.
Target: ia64-unknown-linux-gnu
Configured with: ../gcc-4.1-20050618/configure --prefix=/home/zfkts --enable-
languages=c,f95
Thread model: posix
gcc version 4.1.0 20050618 (experimental)
$ nm a.out | grep eoshift
                 U _gfortran_eoshift3_4

-- 
           Summary: eoshift: boundary not filled in correctly
           Product: gcc
           Version: 4.1.0
            Status: UNCONFIRMED
          Keywords: wrong-code
          Severity: normal
          Priority: P2
         Component: libfortran
        AssignedTo: unassigned at gcc dot gnu dot org
        ReportedBy: tkoenig at gcc dot gnu dot org
                CC: gcc-bugs at gcc dot gnu dot org


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] eoshift: boundary not filled in correctly

[fxcoudert at gcc dot gnu dot org]

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |NEW
     Ever Confirmed|                            |1
   Last reconfirmed|0000-00-00 00:00:00         |2005-06-23 12:39:48
               date|                            |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] eoshift: boundary not filled in correctly

[tkoenig at gcc dot gnu dot org]

------- Additional Comments From tkoenig at gcc dot gnu dot org  2005-06-27 09:49 -------
Created an attachment (id=9156)
 --> (http://gcc.gnu.org/bugzilla/attachment.cgi?id=9156&action=view)
Proposed patch.


-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at gcc dot gnu   |tkoenig at gcc dot gnu dot
                   |dot org                     |org
             Status|NEW                         |ASSIGNED


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] eoshift: boundary not filled in correctly

[tkoenig at gcc dot gnu dot org]

------- Additional Comments From tkoenig at gcc dot gnu dot org  2005-06-27 09:51 -------
(From update of attachment 9156)
The patch was for the wrong bug report *sigh*.


-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
Attachment #9156 is|0                           |1
           obsolete|                            |


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] eoshift: boundary not filled in correctly

[tkoenig at gcc dot gnu dot org]

------- Additional Comments From tkoenig at gcc dot gnu dot org  2005-06-27 12:02 -------
This is missing:

*** eoshift3.m4 2005-06-27 14:05:51.000000000 +0200
--- /home/zfkts/gcc-maint/libgfortran/m4/eoshift3.m4    2005-06-27 
11:47:13.000000000 +0200
***************
*** 136,142 ****

            hstride[n] = h->dim[n].stride;
            if (bound)
!             bstride[n] = bound->dim[n].stride * size;
            else
              bstride[n] = 0;
            n++;
--- 136,142 ----

            hstride[n] = h->dim[n].stride;
            if (bound)
!             bstride[n] = bound->dim[n].stride;
            else
              bstride[n] = 0;
            n++;


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] eoshift: boundary not filled in correctly

[tkoenig at gcc dot gnu dot org]

------- Additional Comments From tkoenig at gcc dot gnu dot org  2005-06-27 12:11 -------
Actually, the patch should be the other way around.

-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] eoshift: boundary not filled in correctly

[cvs-commit at gcc dot gnu dot org]

------- Additional Comments From cvs-commit at gcc dot gnu dot org  2005-06-28 21:57 -------
Subject: Bug 22142

CVSROOT:	/cvs/gcc
Module name:	gcc
Changes by:	tkoenig@gcc.gnu.org	2005-06-28 21:57:45

Modified files:
	libgfortran    : ChangeLog 
	libgfortran/generated: eoshift3_4.c eoshift3_8.c 
	libgfortran/m4 : eoshift3.m4 
	gcc/testsuite  : ChangeLog 
	gcc/testsuite/gfortran.fortran-torture/execute: 
	                                                intrinsic_eoshift.f90 

Log message:
	2005-06-28  Thomas Koenig  <Thomas.Koenig@online.de>
	
	PR libfortran/22142
	* m4/eoshift3.m4:  Correct bstride (it needs to be multiplied
	by size since it's a char pointer).
	* m4/eoshift3_4.c:  Regenerated.
	* m4/eoshift3_8.c:  Regenerated.
	
	2005-06-28  Thomas Koenig  <Thomas.Koenig@online.de>
	
	PR libfortran/22142
	* gfortran.fortran-torture/execute/intrinsic_eoshift.f90:
	Add testcase for PR 22142.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/ChangeLog.diff?cvsroot=gcc&r1=1.252&r2=1.253
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/eoshift3_4.c.diff?cvsroot=gcc&r1=1.8&r2=1.9
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/eoshift3_8.c.diff?cvsroot=gcc&r1=1.8&r2=1.9
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/m4/eoshift3.m4.diff?cvsroot=gcc&r1=1.9&r2=1.10
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/testsuite/ChangeLog.diff?cvsroot=gcc&r1=1.5699&r2=1.5700
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_eoshift.f90.diff?cvsroot=gcc&r1=1.2&r2=1.3



-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] eoshift: boundary not filled in correctly

[cvs-commit at gcc dot gnu dot org]

------- Additional Comments From cvs-commit at gcc dot gnu dot org  2005-06-28 23:07 -------
Subject: Bug 22142

CVSROOT:	/cvs/gcc
Module name:	gcc
Changes by:	tkoenig@gcc.gnu.org	2005-06-28 23:07:22

Modified files:
	libgfortran    : ChangeLog 
	libgfortran/generated: eoshift1_4.c eoshift1_8.c 
	libgfortran/m4 : eoshift1.m4 
	gcc/testsuite  : ChangeLog 
	gcc/testsuite/gfortran.fortran-torture/execute: 
	                                                intrinsic_eoshift.f90 

Log message:
	2005-06-28  Thomas Koenig  <Thomas.Koenig@online.de>
	
	PR libfortran/22142
	* m4/eoshift1.m4:  Correct bstride (it needs to be multiplied
	by size since it's a char pointer).
	* m4/eoshift1_4.c:  Regenerated.
	* m4/eoshift1_8.c:  Regenerated.
	
	2005-06-28  Thomas Koenig  <Thomas.Koenig@online.de>
	
	PR libfortran/22142
	* gfortran.fortran-torture/execute/intrinsic_eoshift.f90:
	Add testcase also testing eoshift1 for PR 22142.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/ChangeLog.diff?cvsroot=gcc&r1=1.253&r2=1.254
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/eoshift1_4.c.diff?cvsroot=gcc&r1=1.8&r2=1.9
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/eoshift1_8.c.diff?cvsroot=gcc&r1=1.8&r2=1.9
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/m4/eoshift1.m4.diff?cvsroot=gcc&r1=1.9&r2=1.10
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/testsuite/ChangeLog.diff?cvsroot=gcc&r1=1.5701&r2=1.5702
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_eoshift.f90.diff?cvsroot=gcc&r1=1.3&r2=1.4



-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] [4.0 only] eoshift: boundary not filled in correctly

[tkoenig at gcc dot gnu dot org]

------- Additional Comments From tkoenig at gcc dot gnu dot org  2005-06-28 23:11 -------
Fixed on 4.1, waiting for 4.0 to reopen.

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
      Known to fail|                            |4.0.1
      Known to work|                            |4.1.0
            Summary|eoshift: boundary not filled|[4.0 only] eoshift: boundary
                   |in correctly                |not filled in correctly
   Target Milestone|---                         |4.0.2


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] [4.0 only] eoshift: boundary not filled in correctly

[cvs-commit at gcc dot gnu dot org]

------- Additional Comments From cvs-commit at gcc dot gnu dot org  2005-07-14 21:17 -------
Subject: Bug 22142

CVSROOT:	/cvs/gcc
Module name:	gcc
Branch: 	gcc-4_0-branch
Changes by:	tkoenig@gcc.gnu.org	2005-07-14 21:17:44

Modified files:
	libgfortran    : ChangeLog 
	libgfortran/generated: cshift1_4.c cshift1_8.c eoshift1_4.c 
	                       eoshift1_8.c eoshift3_4.c eoshift3_8.c 
	libgfortran/intrinsics: eoshift0.c eoshift2.c 
	libgfortran/m4 : cshift1.m4 eoshift1.m4 eoshift3.m4 
	gcc/testsuite  : ChangeLog 
	gcc/testsuite/gfortran.fortran-torture/execute: 
	                                                intrinsic_eoshift.f90 
Added files:
	gcc/testsuite/gfortran.dg: shift-alloc.f90 

Log message:
	2005-07-14  Thomas Koenig  <Thomas.Koenig@online.de>
	
	Backport from mainline.
	PR libfortran/21594
	PR libfortran/22142
	PR libfortran/22144
	* intrinsics/eoshift0.c:  If abs(shift) > len, fill the
	the whole array with the boundary value, but don't overrun it.
	* intrinsics/eoshift2.c:  Likewise.
	* m4/eoshift1.m4:  Likewise.
	* m4/eoshift3.m4:  Likewise.
	* m4/eoshift1.m4:  Correct bstride (it needs to be multiplied
	by size since it's a char pointer).
	* m4/eoshift3.m4:  Likewise.
	* m4/cshift1.m4: Remove const from argument ret.
	Populate return array descriptor if ret->data is NULL.
	* m4/eoshift1.m4: Likewise.
	* generated/eoshift1_4.c:  Regenerated.
	* generated/eoshift1_8.c:  Regenerated.
	* generated/eoshift3_4.c:  Regenerated.
	* generated/eoshift3_8.c:  Regenerated.
	
	2005-07-14  Thomas Koenig  <Thomas.Koenig@online.de>
	
	Backport from mainline:
	PR libfortran/21594
	PR libfortran/22144
	PR libfortran/22142
	* gfortran.fortran-torture/execute/intrinsic_eoshift.f90:
	Add test cases where the shift length is greater than the
	array length.
	Add test cases for PR 22142 for eoshift1 and eoshift3.
	* gfortran.dg/shift-alloc.f90:  New testcase.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/ChangeLog.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.163.2.61&r2=1.163.2.62
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/cshift1_4.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.5.12.1&r2=1.5.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/cshift1_8.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.5.12.1&r2=1.5.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/eoshift1_4.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.5.12.1&r2=1.5.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/eoshift1_8.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.5.12.1&r2=1.5.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/eoshift3_4.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.5.12.1&r2=1.5.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/generated/eoshift3_8.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.5.12.1&r2=1.5.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/intrinsics/eoshift0.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.9.12.1&r2=1.9.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/intrinsics/eoshift2.c.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.9.12.1&r2=1.9.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/m4/cshift1.m4.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.6.12.1&r2=1.6.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/m4/eoshift1.m4.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.6.12.1&r2=1.6.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libgfortran/m4/eoshift3.m4.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.6.12.1&r2=1.6.12.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/testsuite/ChangeLog.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.5084.2.276&r2=1.5084.2.277
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_eoshift.f90.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=1.2&r2=1.2.46.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/testsuite/gfortran.dg/shift-alloc.f90.diff?cvsroot=gcc&only_with_tag=gcc-4_0-branch&r1=NONE&r2=1.1.8.1



-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142

[Bug libfortran/22142] [4.0 only] eoshift: boundary not filled in correctly

[tkoenig at gcc dot gnu dot org]

------- Additional Comments From tkoenig at gcc dot gnu dot org  2005-07-14 21:20 -------
Fixed in 4.0.

-- 
           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|                            |FIXED


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22142