aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDaniel Franke <franke.daniel@gmail.com>2007-07-22 12:37:12 -0400
committerDaniel Franke <dfranke@gcc.gnu.org>2007-07-22 12:37:12 -0400
commiteec14ce5ec901fc2bab2cc8b25b5ec6c8f9ce3d5 (patch)
tree66448a3dd6b7e52ad2cc8398829796edab77d651 /gcc
parent26677eb88e7a381bb625e30d60529974e086d594 (diff)
downloadgcc-eec14ce5ec901fc2bab2cc8b25b5ec6c8f9ce3d5.zip
gcc-eec14ce5ec901fc2bab2cc8b25b5ec6c8f9ce3d5.tar.gz
gcc-eec14ce5ec901fc2bab2cc8b25b5ec6c8f9ce3d5.tar.bz2
re PR fortran/32710 (ICE: namelist and subroutine with the same name)
gcc/fortran: 2007-07-22 Daniel Franke <franke.daniel@gmail.com> PR fortran/32710 * parse.c (gfc_fixup_sibling_symbols): No replacement of symbols if the current is a namelist. gcc/testsuite: 2007-07-22 Daniel Franke <franke.daniel@gmail.com> PR fortran/32710 * gfortran.dg/namelist_30.f90: New test. From-SVN: r126828
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog6
-rw-r--r--gcc/fortran/parse.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gfortran.dg/namelist_30.f9019
4 files changed, 32 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 16d2c1e..1ad6866 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
2007-07-22 Daniel Franke <franke.daniel@gmail.com>
+ PR fortran/32710
+ * parse.c (gfc_fixup_sibling_symbols): No replacement of symbols if
+ the current is a namelist.
+
+2007-07-22 Daniel Franke <franke.daniel@gmail.com>
+
PR fortran/29962
PR fortran/31253
PR fortran/31265
diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c
index df31bcd..974f3a2 100644
--- a/gcc/fortran/parse.c
+++ b/gcc/fortran/parse.c
@@ -2769,7 +2769,8 @@ gfc_fixup_sibling_symbols (gfc_symbol *sym, gfc_namespace *siblings)
if ((old_sym->attr.flavor == FL_PROCEDURE
|| old_sym->ts.type == BT_UNKNOWN)
&& old_sym->ns == ns
- && !old_sym->attr.contained)
+ && !old_sym->attr.contained
+ && old_sym->attr.flavor != FL_NAMELIST)
{
/* Replace it with the symbol from the parent namespace. */
st->n.sym = sym;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f13e9c6..17989ac 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
2007-07-22 Daniel Franke <franke.daniel@gmail.com>
+ PR fortran/32710
+ * gfortran.dg/namelist_30.f90: New test.
+
+2007-07-22 Daniel Franke <franke.daniel@gmail.com>
+
PR fortran/29962
* gfortran.dg/array_initializer_1.f90: Removed warning.
* gfortran.dg/initialization_1.f90: Adjusted messages.
diff --git a/gcc/testsuite/gfortran.dg/namelist_30.f90 b/gcc/testsuite/gfortran.dg/namelist_30.f90
new file mode 100644
index 0000000..1e7cb9e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/namelist_30.f90
@@ -0,0 +1,19 @@
+! { dg-do compile }
+!
+! PR fortran/32710 - ICE: namelist and subroutine with the same name
+!
+! Contributed by Janus Weil <jaydub66 AT gmail DOT com>
+!
+
+program x
+contains
+ subroutine readInput
+ integer:: a
+ NAMELIST /foo/ a
+ read(5,nml=foo)
+ end subroutine readInput
+
+ subroutine foo()
+ end subroutine
+
+end program