From 072eee8f22b99e2362ccdc3930fbfc61e1800b63 Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Tue, 13 Sep 2016 17:00:29 +0000 Subject: [PATCH] re PR fortran/77420 (gfortran and equivalence produces internal compiler error) 2016-09-13 Steven G. Kargl PR fortran/77420 * module.c (load_equiv): Revert revision 240063. 2016-09-13 Steven G. Kargl PR fortran/77420 * gfortran.dg/pr77420.f90: Revert revision 240063 by removing test. From-SVN: r240118 --- gcc/fortran/ChangeLog | 5 +++++ gcc/fortran/module.c | 2 +- gcc/testsuite/ChangeLog | 12 ------------ gcc/testsuite/gfortran.dg/pr77420.f90 | 18 ------------------ 4 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 gcc/testsuite/gfortran.dg/pr77420.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0c0e2460183..77ab72f1371 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2016-09-13 Steven G. Kargl + + PR fortran/77420 + * module.c (load_equiv): Revert revision 240063. + 2016-09-10 Paul Thomas Steven G. Kargl diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 18e1ceeff9e..4d664f079f5 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 = gfc_current_ns->equiv ? false:true; + duplicate = false; 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 d6f6b32ba4b..4d10c24091a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -84,13 +84,6 @@ PR rtl-optimization/77289 * gcc.target/powerpc/pr77289.c: New test. -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 @@ -98,11 +91,6 @@ * 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 deleted file mode 100644 index 89abe71b3f5..00000000000 --- a/gcc/testsuite/gfortran.dg/pr77420.f90 +++ /dev/null @@ -1,18 +0,0 @@ -! { 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