From 352c2128b444a858e1a273de4b7a14d293e48968 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Sat, 10 Sep 2016 00:52:45 +0000 Subject: [PATCH] re PR fortran/77420 (gfortran and equivalence produces internal compiler error) 2016-09-09 Steven G. Kargl PR fortran/77420 * module.c (load_equiv): If the current namespace has a list of equivalence statements, initialize duplicate to false and then look for duplicates; otherwise, initialize it to true. 2016-09-09 Steven G. Kargl PR fortran/77420 * gfortran.dg/pr77420.f90: New test. From-SVN: r240063 --- gcc/fortran/module.c | 2 +- gcc/testsuite/ChangeLog | 12 ++++++++++++ gcc/testsuite/gfortran.dg/pr77420.f90 | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/pr77420.f90 diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 4d664f079f5..18e1ceeff9e 100644 --- a/gcc/fortran/module.c +++ b/gcc/fortran/module.c @@ -4647,7 +4647,7 @@ load_equiv (void) } /* Check for duplicate equivalences being loaded from different modules */ - duplicate = false; + duplicate = gfc_current_ns->equiv ? false:true; for (equiv = gfc_current_ns->equiv; equiv; equiv = equiv->next) { if (equiv->module && head->module diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3b934a03a90..93c2826a093 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2016-09-09 Steven G. Kargl + + PR fortran/77420 + * module.c (load_equiv): If the current namespace has a list of + equivalence statements, initialize duplicate to false and then + look for duplicates; otherwise, initialize it to true. + 2016-09-09 Martin Sebor PR c/77520 @@ -5,6 +12,11 @@ * gcc.dg/pr77520.c: New test. * gcc.dg/pr77521.c: New test. +2016-09-09 Steven G. Kargl + + PR fortran/77420 + * gfortran.dg/pr77420.f90: New test. + 2016-09-09 Steven G. Kargl PR fortran/77506 diff --git a/gcc/testsuite/gfortran.dg/pr77420.f90 b/gcc/testsuite/gfortran.dg/pr77420.f90 new file mode 100644 index 00000000000..89abe71b3f5 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr77420.f90 @@ -0,0 +1,18 @@ +! { dg-do compile } +MODULE test_equivalence + REAL, PRIVATE, DIMENSION(100) :: array1 + REAL, PRIVATE, DIMENSION(100) :: array2 + EQUIVALENCE(array1(1),array2(1)) +END MODULE test_equivalence + +MODULE mymodule + USE test_equivalence + ! declare a local variable with the same name as the (private!) + ! variable in module test_equivalence: + REAL, DIMENSION(:), ALLOCATABLE :: array1 +END MODULE mymodule + +PROGRAM test + USE mymodule +END PROGRAM test + -- 2.30.2