diff options
| author | janus <janus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-16 23:13:31 +0000 |
|---|---|---|
| committer | janus <janus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-16 23:13:31 +0000 |
| commit | ddacf2e20f58b36504a91c602721ec14481385e3 (patch) | |
| tree | ac40f4bd5f7a9d8c195ea3706f94fc3bc22776df | |
| parent | 0952470405408223ce8e403dff6ca202ee884f02 (diff) | |
| download | gcc-ddacf2e20f58b36504a91c602721ec14481385e3.tar.gz | |
2013-11-16 Janus Weil <janus@gcc.gnu.org>
Backport from mainline
2013-09-20 Janus Weil <janus@gcc.gnu.org>
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-11-16 Janus Weil <janus@gcc.gnu.org>
Backport from mainline
2013-09-20 Janus Weil <janus@gcc.gnu.org>
PR fortran/58099
* gfortran.dg/proc_ptr_43.f90: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch@204908 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/fortran/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 8 | ||||
| -rw-r--r-- | gcc/fortran/interface.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/proc_ptr_43.f90 | 19 |
5 files changed, 42 insertions, 11 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6be3c238ad7..4428f8f3024 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,14 @@ +2013-11-16 Janus Weil <janus@gcc.gnu.org> + + Backport from mainline + 2013-09-20 Janus Weil <janus@gcc.gnu.org> + + 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-11-16 Paul Thomas <pault@gcc.gnu.org> PR fortran/58771 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index d16bdb09089..7f101ba03d5 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -3555,14 +3555,6 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue) return FAILURE; } - 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 FAILURE; - } - return SUCCESS; } diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 895eee48c2f..725cd8a4b76 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1245,7 +1245,8 @@ check_result_characteristics (gfc_symbol *s1, gfc_symbol *s2, return FAILURE; } - if (r1->ts.u.cl->length) + if (s1->ts.u.cl && s1->ts.u.cl->length + && s2->ts.u.cl && s2->ts.u.cl->length) { int compval = gfc_dep_compare_expr (r1->ts.u.cl->length, r2->ts.u.cl->length); @@ -1367,8 +1368,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) - == FAILURE) + if (check_result_characteristics (s1, s2, errmsg, err_len) == FAILURE + || check_result_characteristics (s2, s1, errmsg, err_len) == FAILURE) return 0; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2bf5c698339..6d6af0abf9c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2013-11-16 Janus Weil <janus@gcc.gnu.org> + + Backport from mainline + 2013-09-20 Janus Weil <janus@gcc.gnu.org> + + PR fortran/58099 + * gfortran.dg/proc_ptr_43.f90: New. + 2013-11-16 Paul Thomas <pault@gcc.gnu.org> PR fortran/58771 diff --git a/gcc/testsuite/gfortran.dg/proc_ptr_43.f90 b/gcc/testsuite/gfortran.dg/proc_ptr_43.f90 new file mode 100644 index 00000000000..b1f77a06ec6 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/proc_ptr_43.f90 @@ -0,0 +1,19 @@ +! { dg-do compile } +! +! PR 58099: [4.8/4.9 Regression] [F03] over-zealous procedure-pointer error checking +! +! Contributed by Daniel Price <daniel.price@monash.edu> + + implicit none + procedure(real), pointer :: wfunc + + wfunc => w_cubic + +contains + + pure real function w_cubic(q2) + real, intent(in) :: q2 + w_cubic = 0. + end function + +end |