2010-06-09 Steven G. Kargl

   * gfortran.dg/data_namelist_conflict.f90: New test.

2010-06-09  Steven G. Kargl

   * fortran/symbol.c (check_conflict):  Remove an invalid conflict check.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160503 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 0a9361e7f4fd8ddd029f4cb1f84b4792b165e112..5e3ffdc52bb654edad4802ad92a7de3a34315d48 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-09  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       * fortran/symbol.c (check_conflict):  Remove an invalid conflict check.
+
 2010-06-09  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        * fortran/intrinsic.c (add_functions): Change gfc_check_btest,

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index adae49f16062995111a9ffd9d062827ce6d1aaed..07802e8349a70e2a2cde3064ddaca0352b28406f 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -545,7 +545,6 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where)
   conf (data, function);
   conf (data, result);
   conf (data, allocatable);
-  conf (data, use_assoc);
 
   conf (value, pointer)
   conf (value, allocatable)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 67b09367fe67f0678f21f1b5e680bcacc9748d7f..125b602c6005b701713e25295875f8331ce32c13 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-09  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       * gfortran.dg/data_namelist_conflict.f90: New test.
+
 2010-06-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * g++.old-deja/g++.oliva/dwarf2.C: Don't xfail on i386-pc-solaris*.

diff --git a/gcc/testsuite/gfortran.dg/data_namelist_conflict.f90 b/gcc/testsuite/gfortran.dg/data_namelist_conflict.f90
new file mode 100644 (file)
index 0000000..b09f167
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/data_namelist_conflict.f90
@@ -0,0 +1,26 @@
+! { dg-do run }
+! Problem report: http://gcc.gnu.org/ml/fortran/2010-05/msg00139.html
+!
+module globals
+   implicit none
+   integer j
+   data j/1/
+end module
+
+program test
+   use globals
+   implicit none
+   character(len=80) str
+   integer :: i
+   data i/0/
+   namelist /nl/i,j
+   open(unit=10,status='scratch')
+   write(10,nl)
+   i = 42
+   j = 42
+   rewind(10)
+   read(10,nl)
+   if (i /= 0 .or. j /= 1) call abort
+   close(10)
+end program
+! { dg-final { cleanup-modules "globals" } }