OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/35721 (ASSOCIATED returns false when strides confusing) 

2008-03-28  Tobias Burnus  <burnus@net-b.de>

        PR fortran/35721
        * intrinsics/associated.c (associated): Ignore different
        stride of pointer vs. target if only one element is referred.

2008-03-28  Tobias Burnus  <burnus@net-b.de>

        PR fortran/35721
        * gfortran.dg/associated_target_2.f90: New.

From-SVN: r133684
This commit is contained in:
Tobias Burnus 2008-03-28 14:47:06 +01:00 committed by Tobias Burnus
parent 626f4dd8f5
commit 3e08bbcfe8
4 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2008-03-28 Tobias Burnus <burnus@net-b.de>
PR fortran/35721
* gfortran.dg/associated_target_2.f90: New.
2008-03-28 Richard Guenther <rguenther@suse.de>
PR tree-optimization/19580

41
gcc/testsuite/gfortran.dg/associated_target_2.f90 Normal file
View File

@ -0,0 +1,41 @@
! { dg-do run }
!
! PR fortran/35721
!
! ASSOCIATED(ptr, trgt) should return true if
! the same storage units (in the same order)
! gfortran was returning false if the strips
! were different but only one (the same!) element
! was present.
!
! Contributed by Dick Hendrickson
!
program try_mg0028
implicit none
real tda2r(2,3)
call mg0028(tda2r, 1, 2, 3)
CONTAINS
SUBROUTINE MG0028(TDA2R,nf1,nf2,nf3)
integer :: nf1,nf2,nf3
real, target :: TDA2R(NF2,NF3)
real, pointer :: TLA2L(:,:),TLA2L1(:,:)
logical LL(4)
TLA2L => TDA2R(NF2:NF1:-NF2,NF3:NF1:-NF2)
TLA2L1 => TLA2L
LL(1) = ASSOCIATED(TLA2L)
LL(2) = ASSOCIATED(TLA2L,TLA2L1)
LL(3) = ASSOCIATED(TLA2L,TDA2R)
LL(4) = ASSOCIATED(TLA2L1,TDA2R(2:2,3:1:-2)) !should be true
if (any(LL .neqv. (/ .true., .true., .false., .true./))) then
print *, LL
print *, shape(TLA2L1)
print *, shape(TDA2R(2:2,3:1:-2))
stop
endif
END SUBROUTINE
END PROGRAM

6
libgfortran/ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-28 Tobias Burnus <burnus@net-b.de>
PR fortran/35721
* intrinsics/associated.c (associated): Ignore different
stride of pointer vs. target if only one element is referred.
2008-03-26 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* io/unix.c (fd_close): Do not close STDIN.

8
libgfortran/intrinsics/associated.c
View File

@ -48,10 +48,12 @@ associated (const gfc_array_void *pointer, const gfc_array_void *target)
rank = GFC_DESCRIPTOR_RANK (pointer);
for (n = 0; n < rank; n++)
{
if (pointer->dim[n].stride != target->dim[n].stride)
long diff;
diff = pointer->dim[n].ubound - pointer->dim[n].lbound;
if (diff != (target->dim[n].ubound - target->dim[n].lbound))
return 0;
if ((pointer->dim[n].ubound - pointer->dim[n].lbound)
!= (target->dim[n].ubound - target->dim[n].lbound))
if (pointer->dim[n].stride != target->dim[n].stride && diff != 0)
return 0;
if (pointer->dim[n].ubound < pointer->dim[n].lbound)
return 0;