From a4a76e5242236301f4713efae30642fb39e5d0eb Mon Sep 17 00:00:00 2001
From: Janus Weil <janus@gcc.gnu.org>
Date: Mon, 17 Sep 2012 14:50:34 +0200
Subject: [PATCH] re PR fortran/54285 ([F03] Calling a PPC with proc-ptr
result)
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.
From-SVN: r191383
---
gcc/fortran/ChangeLog | 8 ++++++
gcc/fortran/expr.c | 12 +++++++--
gcc/fortran/primary.c | 5 ++--
gcc/testsuite/ChangeLog | 5 ++++
.../gfortran.dg/proc_ptr_result_7.f90 | 27 +++++++++++++++++++
5 files changed, 52 insertions(+), 5 deletions(-)
create mode 100644 gcc/testsuite/gfortran.dg/proc_ptr_result_7.f90
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3f6e3be42ab4..3d7e009bb92e 100644
--- 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 dced05dfb463..4bba438c25e0 100644
--- 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 cadc20c27b76..f362f75426aa 100644
--- 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 eb1f595fe55a..2cbdb5a4b6da 100644
--- 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
index 000000000000..1d810c6b5fad
--- /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
--
GitLab