diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-09-13 17:00:29 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-09-13 17:00:29 +0000 |
| commit | 072eee8f22b99e2362ccdc3930fbfc61e1800b63 (patch) | |
| tree | deb27dd7ef3176b87a01bbae18773e93918844aa /gcc | |
| parent | 9fd2074dc90e0fc91bcadf605262a7fe6d07bd88 (diff) | |
| download | gcc-072eee8f22b99e2362ccdc3930fbfc61e1800b63.zip gcc-072eee8f22b99e2362ccdc3930fbfc61e1800b63.tar.gz gcc-072eee8f22b99e2362ccdc3930fbfc61e1800b63.tar.bz2 | |
re PR fortran/77420 (gfortran and equivalence produces internal compiler error)
2016-09-13 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/77420
* module.c (load_equiv): Revert revision 240063.
2016-09-13 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/77420
* gfortran.dg/pr77420.f90: Revert revision 240063 by removing test.
From-SVN: r240118
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/module.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr77420.f90 | 18 |
4 files changed, 6 insertions, 31 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0c0e246..77ab72f 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2016-09-13 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/77420 + * module.c (load_equiv): Revert revision 240063. + 2016-09-10 Paul Thomas <pault@gcc.gnu.org> Steven G. Kargl <kargl@gcc.gnu.org> diff --git a/gcc/fortran/module.c b/gcc/fortran/module.c index 18e1cee..4d664f0 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 d6f6b32..4d10c24 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 <kargl@gcc.gnu.org> - - 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 <msebor@redhat.com> PR c/77520 @@ -100,11 +93,6 @@ 2016-09-09 Steven G. Kargl <kargl@gcc.gnu.org> - PR fortran/77420 - * gfortran.dg/pr77420.f90: New test. - -2016-09-09 Steven G. Kargl <kargl@gcc.gnu.org> - PR fortran/77506 * gfortran.dg/pr77506.f90: New test. diff --git a/gcc/testsuite/gfortran.dg/pr77420.f90 b/gcc/testsuite/gfortran.dg/pr77420.f90 deleted file mode 100644 index 89abe71..0000000 --- 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 - |