From 68fc0d2a63e35d58f29afd1815409d961ce76578 Mon Sep 17 00:00:00 2001 From: janus Date: Fri, 20 Sep 2013 07:44:05 +0000 Subject: 2013-09-20 Janus Weil PR fortran/58099 * expr.c (gfc_check_pointer_assign): Remove second call to 'gfc_compare_interfaces' with swapped arguments. * interface.c (gfc_compare_interfaces): Symmetrize the call to 'check_result_characteristics' by calling it with swapped arguments. 2013-09-20 Janus Weil PR fortran/58099 * gfortran.dg/proc_ptr_43.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@202766 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fortran/ChangeLog | 8 ++++++++ gcc/fortran/expr.c | 8 -------- gcc/fortran/interface.c | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index de38d3f00fa..0e4d688f975 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2013-09-20 Janus Weil + + PR fortran/58099 + * expr.c (gfc_check_pointer_assign): Remove second call to + 'gfc_compare_interfaces' with swapped arguments. + * interface.c (gfc_compare_interfaces): Symmetrize the call to + 'check_result_characteristics' by calling it with swapped arguments. + 2013-09-18 Tobias Burnus * expr.c (gfc_check_assign_symbol): Free lvalue.ref. diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 666309245f0..b2af32816e5 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3581,14 +3581,6 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue) return false; } - if (!gfc_compare_interfaces (s2, s1, name, 0, 1, - err, sizeof(err), NULL, NULL)) - { - gfc_error ("Interface mismatch in procedure pointer assignment " - "at %L: %s", &rvalue->where, err); - return false; - } - return true; } diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index aa88b3c3fa6..b8786440fbe 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1416,7 +1416,8 @@ gfc_compare_interfaces (gfc_symbol *s1, gfc_symbol *s2, const char *name2, if (s1->attr.function && s2->attr.function) { /* If both are functions, check result characteristics. */ - if (!check_result_characteristics (s1, s2, errmsg, err_len)) + if (!check_result_characteristics (s1, s2, errmsg, err_len) + || !check_result_characteristics (s2, s1, errmsg, err_len)) return 0; } -- cgit v1.2.1