From 2050626ae819be7b6409b53b2fc641bcc37949f4 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Fri, 13 Nov 2015 00:14:32 +0000 Subject: [PATCH] re PR fortran/68318 (ICE on duplicate entry declarations) 2015-11-12 Steven G. Kargl PR fortran/68318 * decl.c (get_proc_name): Increment reference count for ENTRY. While here, fix comment and use postfix ++ for consistency. 2015-11-12 Steven G. Kargl PR fortran/68318 * gfortran.dg/pr68318_1.f90: New test. * gfortran.dg/pr68318_2.f90: Ditto. From-SVN: r230278 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/decl.c | 5 +++-- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/pr68318_1.f90 | 18 ++++++++++++++++++ gcc/testsuite/gfortran.dg/pr68318_2.f90 | 22 ++++++++++++++++++++++ 5 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr68318_1.f90 create mode 100644 gcc/testsuite/gfortran.dg/pr68318_2.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b0c10ad22e0..4910f077e84 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2015-11-12 Steven G. Kargl + + PR fortran/68318 + * decl.c (get_proc_name): Increment reference count for ENTRY. + While here, fix comment and use postfix ++ for consistency. + 2015-11-11 Andrew MacLeod * array.c: Remove unused header files. diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 157eb237fa7..c10557e968c 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -925,6 +925,7 @@ get_proc_name (const char *name, gfc_symbol **result, bool module_fcn_entry) gfc_find_sym_tree (name, gfc_current_ns, 0, &st); st->n.sym = *result; st = gfc_get_unique_symtree (gfc_current_ns); + sym->refs++; st->n.sym = sym; } } @@ -971,7 +972,7 @@ get_proc_name (const char *name, gfc_symbol **result, bool module_fcn_entry) /* Trap another encompassed procedure with the same name. All these conditions are necessary to avoid picking up an entry whose name clashes with that of the encompassing procedure; - this is handled using gsymbols to register unique,globally + this is handled using gsymbols to register unique, globally accessible names. */ if (sym->attr.flavor != 0 && sym->attr.proc != 0 @@ -9051,7 +9052,7 @@ gfc_match_final_decl (void) /* Add this symbol to the list of finalizers. */ gcc_assert (block->f2k_derived); - ++sym->refs; + sym->refs++; f = XCNEW (gfc_finalizer); f->proc_sym = sym; f->proc_tree = NULL; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 86054c4c81f..6531a10068e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2015-11-12 Steven G. Kargl + + PR fortran/68318 + * gfortran.dg/pr68318_1.f90: New test. + * gfortran.dg/pr68318_2.f90: Ditto. + 2015-11-12 James Norris Joseph Myers diff --git a/gcc/testsuite/gfortran.dg/pr68318_1.f90 b/gcc/testsuite/gfortran.dg/pr68318_1.f90 new file mode 100644 index 00000000000..1a3d59402f6 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr68318_1.f90 @@ -0,0 +1,18 @@ +! { dg-do compile } +! { dg-options "-O0" +! PR fortran/68318 +! Original code submitted by Gerhard Steinmetz +! +! +module m + implicit none +contains + subroutine s1 + entry e ! { dg-error "(2)" } + end + subroutine s2 + entry e ! { dg-error "is already defined" } + end +end module +! { dg-prune-output "Duplicate ENTRY attribute specified" } + diff --git a/gcc/testsuite/gfortran.dg/pr68318_2.f90 b/gcc/testsuite/gfortran.dg/pr68318_2.f90 new file mode 100644 index 00000000000..451b28f2a47 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr68318_2.f90 @@ -0,0 +1,22 @@ +! { dg-do compile } +! PR fortran/68318 +! Original code submitted by Gerhard Steinmetz +! +! +module m1 + implicit none +contains + subroutine s1 + entry e + end +end module + +module m2 + use m1 ! { dg-error "(2)" } + implicit none +contains + subroutine s2 + entry e ! { dg-error "is already defined" } + end +end module +! { dg-prune-output "Cannot change attribute" } -- 2.30.2