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

re PR fortran/52022 (Wrong-code with procedures passed as actual argument) 

2012-01-27  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52022
        * trans-expr.c (gfc_conv_procedure_call): Fix passing
        of functions, which return allocatables.

2012-01-27  Tobias Burnus  <burnus@net-b.de>

        PR fortran/52022
        * gfortran.dg/dummy_procedure_7.f90: New.

From-SVN: r183643
This commit is contained in:
Tobias Burnus 2012-01-27 21:11:51 +01:00 committed by Tobias Burnus
parent bea3da64d6
commit 8c6cb782a3
4 changed files with 78 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 @@
2012-01-27 Tobias Burnus <burnus@net-b.de>
PR fortran/52022
* trans-expr.c (gfc_conv_procedure_call): Fix passing
of functions, which return allocatables.
2012-01-27 Tobias Burnus <burnus@net-b.de>
PR fortran/52016

3
gcc/fortran/trans-expr.c
View File

@ -3662,7 +3662,8 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
|| (fsym->attr.proc_pointer
&& e->expr_type == EXPR_VARIABLE
&& gfc_is_proc_ptr_comp (e, NULL))
|| fsym->attr.allocatable))
|| (fsym->attr.allocatable
&& fsym->attr.flavor != FL_PROCEDURE)))
{
/* Scalar pointer dummy args require an extra level of
indirection. The null pointer already contains

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2012-01-27 Tobias Burnus <burnus@net-b.de>
PR fortran/52022
* gfortran.dg/dummy_procedure_7.f90: New.
2012-01-27 Andreas Schwab <schwab@linux-m68k.org>
* g++.dg/cpp0x/constexpr-rom.C: Don't add -G0 on *-*-darwin*

65
gcc/testsuite/gfortran.dg/dummy_procedure_7.f90 Normal file
View File

@ -0,0 +1,65 @@
! { dg-do run }
!
! PR fortran/52022
!
module check
integer, save :: icheck = 0
end module check
module t
implicit none
contains
subroutine sol(cost)
use check
interface
function cost(p) result(y)
double precision,dimension(:) :: p
double precision,dimension(:),allocatable :: y
end function cost
end interface
if (any (cost([1d0,2d0]) /= [2.d0, 4.d0])) call abort ()
icheck = icheck + 1
end subroutine
end module t
module tt
procedure(cost1),pointer :: pcost
contains
subroutine init()
pcost=>cost1
end subroutine
function cost1(x) result(y)
double precision,dimension(:) :: x
double precision,dimension(:),allocatable :: y
allocate(y(2))
y=2d0*x
end function cost1
function cost(x) result(y)
double precision,dimension(:) :: x
double precision,dimension(:),allocatable :: y
allocate(y(2))
y=pcost(x)
end function cost
end module
program test
use tt
use t
use check
implicit none
call init()
if (any (cost([3.d0,7.d0]) /= [6.d0, 14.d0])) call abort ()
if (icheck /= 0) call abort ()
call sol(cost)
if (icheck /= 1) call abort ()
end program test
! { dg-final { cleanup-modules "t tt check" } }