aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorJanus Weil <janus@gcc.gnu.org>2013-04-16 21:07:34 +0200
committerJanus Weil <janus@gcc.gnu.org>2013-04-16 21:07:34 +0200
commitbafa0782ad3ba8e5c92196b00d76b38d69e3e1e1 (patch)
tree824cd9cd51755ef04a26fabd2cfb5ca23280a745 /gcc/fortran
parent18a6701e5b0d7eecd64751e17cfae5069a12745d (diff)
downloadgcc-bafa0782ad3ba8e5c92196b00d76b38d69e3e1e1.zip
gcc-bafa0782ad3ba8e5c92196b00d76b38d69e3e1e1.tar.gz
gcc-bafa0782ad3ba8e5c92196b00d76b38d69e3e1e1.tar.bz2
re PR fortran/56968 ([F03] Issue with a procedure defined with a generic name returning procedure pointer)
2013-04-16 Janus Weil <janus@gcc.gnu.org> PR fortran/56968 * expr.c (gfc_check_pointer_assign): Handle generic functions returning procedure pointers. 2013-04-16 Janus Weil <janus@gcc.gnu.org> PR fortran/56968 * gfortran.dg/proc_ptr_41.f90: New. From-SVN: r198008
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/expr.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 34719a1..ee160b6 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-16 Janus Weil <janus@gcc.gnu.org>
+
+ PR fortran/56968
+ * expr.c (gfc_check_pointer_assign): Handle generic functions returning
+ procedure pointers.
+
2013-04-16 Tobias Burnus <burnus@net-b.de>
PR fortran/56969
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index e4bcc79..490cdaa 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -3540,7 +3540,11 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue)
}
else if (rvalue->expr_type == EXPR_FUNCTION)
{
- s2 = rvalue->symtree->n.sym->result;
+ if (rvalue->value.function.esym)
+ s2 = rvalue->value.function.esym->result;
+ else
+ s2 = rvalue->symtree->n.sym->result;
+
name = s2->name;
}
else