diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2010-06-09 18:32:20 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2010-06-09 18:32:20 +0000 |
| commit | 87b189096bcdb8ecfb9d1be2c1c5c03997d7a213 (patch) | |
| tree | 52a4abf7c62844fe072f0e10274785d3c2e39787 /gcc | |
| parent | a2b709cc11de270599d1758f1d2c5a17e920c432 (diff) | |
| download | gcc-87b189096bcdb8ecfb9d1be2c1c5c03997d7a213.zip gcc-87b189096bcdb8ecfb9d1be2c1c5c03997d7a213.tar.gz gcc-87b189096bcdb8ecfb9d1be2c1c5c03997d7a213.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/symbol.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/data_namelist_conflict.f90 | 26 |
4 files changed, 34 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0a9361e..5e3ffdc 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,9 @@ 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, diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index adae49f..07802e8 100644 --- 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 67b0936..125b602 100644 --- 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 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" } } |