From: Janus Weil <janus@gcc.gnu.org>
Date: Tue, 11 Aug 2009 20:08:35 +0000 (+0200)
Subject: re PR fortran/41022 ([F03] procedure pointer components as actual arguments)
X-Git-Tag: releases/gcc-4.5.0~4082
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4561cbd0bd762caa08d6a3a9ae7d9a6bf163d281;p=thirdparty%2Fgcc.git

re PR fortran/41022 ([F03] procedure pointer components as actual arguments)

2009-08-11  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/41022
	* trans-expr.c (gfc_conv_procedure_call): Handle procedure pointer
	components as actual arguments.

2009-08-11  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/41022
	* gfortran.dg/proc_ptr_comp_14.f90: New.

From-SVN: r150665
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 1e8d739085ad..999de40d7895 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-11  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/41022
+	* trans-expr.c (gfc_conv_procedure_call): Handle procedure pointer
+	components as actual arguments.
+
 2009-08-10  Daniel Kraft  <d@domob.eu>
 
 	PR fortran/37425
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 7352db849e06..a6e129b1406a 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -2679,7 +2679,8 @@ gfc_conv_procedure_call (gfc_se * se, gfc_symbol * sym,
 			   && fsym->attr.flavor != FL_PROCEDURE)
 			  || (fsym->attr.proc_pointer
 			      && !(e->expr_type == EXPR_VARIABLE
-			      && e->symtree->n.sym->attr.dummy))))
+			      && e->symtree->n.sym->attr.dummy))
+			  || gfc_is_proc_ptr_comp (e, NULL)))
 		    {
 		      /* Scalar pointer dummy args require an extra level of
 			 indirection. The null pointer already contains
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 017a12b388f7..a6e5bea1d3c3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-11  Janus Weil  <janus@gcc.gnu.org>
+
+	PR fortran/41022
+	* gfortran.dg/proc_ptr_comp_14.f90: New.
+
 2009-08-11  Adam Nemet  <anemet@caviumnetworks.com>
 
 	* gcc.target/mips/ext-5.c: New test.
diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_comp_14.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_comp_14.f90
new file mode 100644
index 000000000000..811223ee2d11
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/proc_ptr_comp_14.f90
@@ -0,0 +1,40 @@
+! { dg-do run }
+!
+! PR 41022: [F03] procedure pointer components as actual arguments
+!
+! Contributed by Juergen Reuter <reuter@physik.uni-freiburg.de>
+
+program foo
+
+   type :: container_t
+      procedure(proc), nopass, pointer :: proc => null ()
+   end type container_t
+
+   type(container_t), target :: obj1
+   type(container_t) :: obj2
+
+   obj1%proc => proc
+   call transfer_proc_ptr (obj2, obj1)
+
+   if (obj2%proc()/=7) call abort()
+
+contains
+
+   subroutine transfer_proc_ptr (obj2, obj1)
+     type(container_t), intent(out) :: obj2
+     type(container_t), intent(in), target :: obj1
+     call assign_proc_ptr (obj2%proc, obj1)
+   end subroutine transfer_proc_ptr
+
+   subroutine assign_proc_ptr (ptr, obj1)
+     procedure(proc), pointer :: ptr
+     type(container_t), intent(in), target :: obj1
+     ptr => obj1%proc
+   end subroutine assign_proc_ptr
+
+   integer function proc ()
+      proc = 7
+   end function
+
+end program foo
+