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

gcc/fortran/ChangeLog

+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

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

gcc/testsuite/ChangeLog

+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.

gcc/testsuite/gfortran.dg/proc_ptr_comp_14.f90

+! { 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
+