2012-09-17 Janus Weil <janus@gcc.gnu.org>

	PR fortran/54285
	* expr.c (gfc_check_pointer_assign): Correctly handle procedure pointers
	as function results.
	* primary.c (gfc_match_varspec): Allow to call a PPC with proc-ptr
	result.

2012-09-17  Janus Weil  <janus@gcc.gnu.org>

	PR fortran/54285
	* gfortran.dg/proc_ptr_result_7.f90: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@191383 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3f6e3be..3d7e009 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2012-09-17  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/54285
+       * expr.c (gfc_check_pointer_assign): Correctly handle procedure pointers
+       as function results.
+       * primary.c (gfc_match_varspec): Allow to call a PPC with proc-ptr
+       result.
+
 2012-09-17  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/54603

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index dced05d..4bba438 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -3513,8 +3513,16 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue)
       comp = gfc_get_proc_ptr_comp (rvalue);
       if (comp)
        {
-         s2 = comp->ts.interface;
-         name = comp->name;
+         if (rvalue->expr_type == EXPR_FUNCTION)
+           {
+             s2 = comp->ts.interface->result;
+             name = comp->ts.interface->result->name;
+           }
+         else
+           {
+             s2 = comp->ts.interface;
+             name = comp->name;
+           }
        }
       else if (rvalue->expr_type == EXPR_FUNCTION)
        {

diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
index cadc20c..f362f75 100644 (file)
--- a/gcc/fortran/primary.c
+++ b/gcc/fortran/primary.c
@@ -2004,8 +2004,7 @@ gfc_match_varspec (gfc_expr *primary, int equiv_flag, bool sub_flag,
 
       primary->ts = component->ts;
 
-      if (component->attr.proc_pointer && ppc_arg
-         && !gfc_matching_procptr_assignment)
+      if (component->attr.proc_pointer && ppc_arg)
        {
          /* Procedure pointer component call: Look for argument list.  */
          m = gfc_match_actual_arglist (sub_flag,
@@ -2014,7 +2013,7 @@ gfc_match_varspec (gfc_expr *primary, int equiv_flag, bool sub_flag,
            return MATCH_ERROR;
 
          if (m == MATCH_NO && !gfc_matching_ptr_assignment
-             && !matching_actual_arglist)
+             && !gfc_matching_procptr_assignment && !matching_actual_arglist)
            {
              gfc_error ("Procedure pointer component '%s' requires an "
                         "argument list at %C", component->name);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eb1f595..2cbdb5a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-17  Janus Weil  <janus@gcc.gnu.org>
+
+       PR fortran/54285
+       * gfortran.dg/proc_ptr_result_7.f90: New.
+
 2012-09-17  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/54603

diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_result_7.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_result_7.f90
new file mode 100644 (file)
index 0000000..1d810c6
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/proc_ptr_result_7.f90
@@ -0,0 +1,27 @@
+! { dg-do run }
+!
+! PR 54285: [F03] Calling a PPC with proc-ptr result
+!
+! Contributed by Janus Weil <janus@gcc.gnu.org>
+
+type :: t
+  procedure(a), pointer, nopass :: p
+end type
+
+type(t) :: x
+procedure(iabs), pointer :: pp
+
+x%p => a
+
+pp => x%p()
+
+if (pp(-3) /= 3) call abort
+
+contains
+
+  function a() result (b)
+    procedure(iabs), pointer :: b
+    b => iabs
+  end function
+
+end