re PR fortran/20848 (PARAMETER and SAVE attribute conflict)

2005-09-07  Thomas Koenig  <Thomas.Koenig@online.de>

	PR fortran/20848
	* symbol.c(check_conflict):  Add conflict for parameter/save,

2005-09-07  Thomas Koenig  <Thomas.Koenig@online.de>

	PR fortran/20848
	* gfortran.dg/parameter+save.f90:  New test case.

From-SVN: r104005

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index dbfc43f631b813c1e596b2efb800913abd207457..f52bac38c55bd5402aa018d28412f3b704fd91fd 100644 (file)
--- 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 c2ee22375662a78f4b061b15166e7c58308ae109..57811f254845caaa33370983efa7ef82fdb30ebc 100644 (file)
--- 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 f17337553ca6e1065c97d7179fb8a7a530e6c19d..9afbb21be3f699ab826744dd0aa948f821245170 100644 (file)
--- 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 (file)
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