diff options
| author | janus <janus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-17 12:50:34 +0000 |
|---|---|---|
| committer | janus <janus@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-09-17 12:50:34 +0000 |
| commit | 75050d8bfef677c909d80f7b095f0e0135042b6d (patch) | |
| tree | ccf8bb60f63d400aee5500fda6226de40f7c80c4 /gcc/fortran | |
| parent | 3f33c4e00db08aec045b0c57cb9571e93fad0b4a (diff) | |
| download | ppe42-gcc-75050d8bfef677c909d80f7b095f0e0135042b6d.tar.gz ppe42-gcc-75050d8bfef677c909d80f7b095f0e0135042b6d.zip | |
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
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/expr.c | 12 | ||||
| -rw-r--r-- | gcc/fortran/primary.c | 5 |
3 files changed, 20 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 3f6e3be42ab..3d7e009bb92 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 dced05dfb46..4bba438c25e 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 cadc20c27b7..f362f75426a 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); |
