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

re PR fortran/49268 (Invalid code generated for assumed-size Cray pointee)

Browse Source 
* trans-decl.c (gfc_trans_deferred_vars): Treat assumed-size Cray
        pointees as AS_EXPLICIT.

    * gfortran.dg/PR49268.f90: New test.

From-SVN: r174584
This commit is contained in:
Asher Langton 2011-06-02 21:41:12 +00:00 committed by Asher Langton
parent 11126dc093
commit cde3a7a969
4 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2011-06-02 Asher Langton <langton2@llnl.gov>
PR fortran/49268
* trans-decl.c (gfc_trans_deferred_vars): Treat assumed-size Cray
pointees as AS_EXPLICIT.
2011-06-02 Asher Langton <langton2@llnl.gov>
PR fortran/37039

6
gcc/fortran/trans-decl.c
View File

@ -3465,7 +3465,11 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block)
if (sym->attr.dimension || sym->attr.codimension)
{
switch (sym->as->type)
/* Assumed-size Cray pointees need to be treated as AS_EXPLICIT. */
array_type tmp = sym->as->type;
if (tmp == AS_ASSUMED_SIZE && sym->as->cp_was_assumed)
tmp = AS_EXPLICIT;
switch (tmp)
{
case AS_EXPLICIT:
if (sym->attr.dummy || sym->attr.result)

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-06-02 Asher Langton <langton2@llnl.gov>
PR fortran/49268
* gfortran.dg/PR49268.f90: New test.
2011-06-02 Asher Langton <langton2@llnl.gov>
PR fortran/37039

51
gcc/testsuite/gfortran.dg/PR49268.f90 Normal file
View File

@ -0,0 +1,51 @@
! { dg-do run }
! { dg-options "-fcray-pointer" }
! Test the fix for a runtime error
! Contributed by Mike Kumbera <kumbera1@llnl.gov>
program bob
implicit none
integer*8 ipfoo
integer n,m,i,j
real*8 foo
common /ipdata/ ipfoo
common /ipsize/ n,m
POINTER ( ipfoo, foo(3,7) )
n=3
m=7
ipfoo=malloc(8*n*m)
do i=1,n
do j=1,m
foo(i,j)=1.d0
end do
end do
call use_foo()
end program bob
subroutine use_foo()
implicit none
integer n,m,i,j
integer*8 ipfoo
common /ipdata/ ipfoo
common /ipsize/ n,m
real*8 foo,boo
!fails if * is the last dimension
POINTER ( ipfoo, foo(n,*) )
!works if the last dimension is specified
!POINTER ( ipfoo, foo(n,m) )
boo=0.d0
do i=1,n
do j=1,m
boo=foo(i,j)+1.0
if (abs (boo - 2.0) .gt. 1e-6) call abort
end do
end do
end subroutine use_foo