This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[Patch, Fortran] PR 52022 Fix function passing for funcs returning allocatable
- From: Tobias Burnus <burnus at net-b dot de>
- To: gcc patches <gcc-patches at gcc dot gnu dot org>, gfortran <fortran at gcc dot gnu dot org>
- Date: Fri, 27 Jan 2012 21:37:52 +0100
- Subject: [Patch, Fortran] PR 52022 Fix function passing for funcs returning allocatable
Dear all,
I have committed the attached patch as obvious (Rev. 183643) after
building and regtesting. I intent to backport it to 4.5 and 4.6.
Tobias
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.
Index: gcc/fortran/trans-expr.c
===================================================================
--- gcc/fortran/trans-expr.c (Revision 183640)
+++ gcc/fortran/trans-expr.c (Arbeitskopie)
@@ -3662,7 +3662,8 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol *
|| (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
Index: gcc/testsuite/gfortran.dg/dummy_procedure_7.f90
===================================================================
--- gcc/testsuite/gfortran.dg/dummy_procedure_7.f90 (Revision 0)
+++ gcc/testsuite/gfortran.dg/dummy_procedure_7.f90 (Arbeitskopie)
@@ -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" } }