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.

From-SVN: r160503

gcc/fortran/ChangeLog

 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,
 	gfc_check_ibclr, and gfc_check_ibset to gfc_check_bitfcn.
 	* fortran/intrinsic.h: Remove prototypes for gfc_check_btest,

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)

gcc/testsuite/ChangeLog

+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*.

gcc/testsuite/gfortran.dg/data_namelist_conflict.f90

+! { 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" } }