diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/typebound_proc_34.f90 | 26 |
4 files changed, 39 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index a9db062..b5324f2 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,11 @@ 2016-11-13 Janus Weil <janus@gcc.gnu.org> + PR fortran/60952 + * decl.c (match_procedure_in_type): Apply the FL_PROCEDURE attribute + to the target procedure. + +2016-11-13 Janus Weil <janus@gcc.gnu.org> + PR fortran/66366 * resolve.c (resolve_component): Move check for C437 to ... diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 4f5c0cf..21eaafe 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -9624,6 +9624,8 @@ match_procedure_in_type (void) false)) return MATCH_ERROR; gfc_set_sym_referenced (stree->n.tb->u.specific->n.sym); + gfc_add_flavor(&stree->n.tb->u.specific->n.sym->attr, FL_PROCEDURE, + target, &stree->n.tb->u.specific->n.sym->declared_at); if (gfc_match_eos () == MATCH_YES) return MATCH_YES; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 65fbaad..99bb0d4b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2016-11-13 Janus Weil <janus@gcc.gnu.org> + PR fortran/60952 + * gfortran.dg/typebound_proc_34.f90: New test. + +2016-11-13 Janus Weil <janus@gcc.gnu.org> + PR fortran/66366 * gfortran.dg/class_57.f90: Changed error message. * gfortran.dg/class_60.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/typebound_proc_34.f90 b/gcc/testsuite/gfortran.dg/typebound_proc_34.f90 new file mode 100644 index 0000000..bf2b882 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/typebound_proc_34.f90 @@ -0,0 +1,26 @@ +! { dg-do compile } +! +! PR 60952: [F03] Problem using "end" as a type bound procedure and contained procedures +! +! Contributed by tlcclt <Thomas.L.Clune@nasa.gov> + +module A_mod + implicit none + + type A + contains + procedure, nopass :: end + end type + +contains + + subroutine swap + contains + subroutine subSwap + end subroutine + end subroutine + + integer function end() + end function + +end module |