diff options
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/symbol.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/parameter+save.f90 | 6 |
4 files changed, 17 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index dbfc43f..f52bac3 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2005-09-07 Thomas Koenig <Thomas.Koenig@online.de> + + PR fortran/20848 + * symbol.c(check_conflict): Add conflict for parameter/save, + 2005-09-06 Richard Sandiford <richard@codesourcery.com> PR fortran/19269 diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index c2ee223..57811f2 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -434,6 +434,7 @@ check_conflict (symbol_attribute * attr, const char * name, locus * where) conf2 (target); conf2 (dummy); conf2 (in_common); + conf2 (save); break; default: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f173375..9afbb21 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-09-07 Thomas Koenig <Thomas.Koenig@online.de> + + PR fortran/20848 + * gfortran.dg/parameter+save.f90: New test case. + 2005-09-06 Richard Sandiford <richard@codesourcery.com> PR fortran/19269 diff --git a/gcc/testsuite/gfortran.dg/parameter+save.f90 b/gcc/testsuite/gfortran.dg/parameter+save.f90 new file mode 100644 index 0000000..ea34ea7 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/parameter+save.f90 @@ -0,0 +1,6 @@ +! { dg-do compile } +! PR 20848 - parameter and save should conflict. + integer, parameter, save :: x=0 ! { dg-error "conflicts" } + integer, save :: y + parameter (y=42) ! { dg-error "conflicts" } +end |