From e5609c8fee62ea24f5fcfa1e3aa7131b1ec18afc Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Fri, 5 Jun 2015 16:54:53 +0000 Subject: [multiple changes] 2015-06-03 Russell Whitesides Steven G. Kargl PR fortran/40958 PR fortran/60780 PR fortran/66377 * module.c (load_equiv): Add check for loading duplicate EQUIVALENCEs from different modules. Eliminate the pruning of unused equivalence-objects 2015-06-03 Steven G. Kargl PR fortran/66377 gfortran.dg/equiv_9.f90: New test. From-SVN: r224159 --- gcc/fortran/ChangeLog | 10 ++++++++++ gcc/fortran/module.c | 22 +++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b446e90..2bf6717 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2015-06-05 Russell Whitesides + Steven G. Kargl + + PR fortran/40958 + PR fortran/60780 + PR fortran/66377 + * module.c (load_equiv): Add check for loading duplicate EQUIVALENCEs + from different modules. Eliminate the pruning of unused + equivalence-objects + 2015-06-04 Thomas Koenig PR fortran/58749 diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 4122c95..e183d90 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -4476,8 +4476,8 @@ load_commons (void) static void load_equiv (void) { - gfc_equiv *head, *tail, *end, *eq; - bool unused; + gfc_equiv *head, *tail, *end, *eq, *equiv; + bool duplicate; mio_lparen (); in_load_equiv = true; @@ -4504,23 +4504,19 @@ load_equiv (void) mio_expr (&tail->expr); } - /* Unused equivalence members have a unique name. In addition, it - must be checked that the symbols are from the same module. */ - unused = true; - for (eq = head; eq; eq = eq->eq) + /* Check for duplicate equivalences being loaded from different modules */ + duplicate = false; + for (equiv = gfc_current_ns->equiv; equiv; equiv = equiv->next) { - if (eq->expr->symtree->n.sym->module - && head->expr->symtree->n.sym->module - && strcmp (head->expr->symtree->n.sym->module, - eq->expr->symtree->n.sym->module) == 0 - && !check_unique_name (eq->expr->symtree->name)) + if (equiv->module && head->module + && strcmp (equiv->module, head->module) == 0) { - unused = false; + duplicate = true; break; } } - if (unused) + if (duplicate) { for (eq = head; eq; eq = head) { -- cgit v1.1