[multiple changes]

2012-01-21  Tobias Burnus  <burnus@net-b.de>
	    Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/50556
	* symbol.c (check_conflict): namelist-group-name cannot have the SAVE
	attribure.

2012-01-21  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/50556
	* gfortran.dg/namelist_74.f90: New test.
	* gfortran.dg/namelist_59.f90: Remove SAVE attribute.

From-SVN: r183370

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index bff42e5478936bba8e28428d6e969ba7d0a26dd6..85aaa210c42890117869870abb7077699e29de16 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-21  Tobias Burnus  <burnus@net-b.de>
+           Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/50556
+       * symbol.c (check_conflict): namelist-group-name cannot have the SAVE
+       attribure.
+
 2012-01-21  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/51913

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index fcc1ccfec583f9df9bc192118aa65cfd01c0a386..36fc1ed562b1fb237223af2c3e76783870f189f2 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -444,12 +444,15 @@ check_conflict (symbol_attribute *attr, const char *name, locus *where)
             a1 = gfc_code2string (flavors, attr->flavor);
             a2 = save;
            goto conflict;
-
+         case FL_NAMELIST:
+           gfc_error ("Namelist group name at %L cannot have the "
+                      "SAVE attribute", where);
+           return FAILURE; 
+           break;
          case FL_PROCEDURE:
            /* Conflicts between SAVE and PROCEDURE will be checked at
               resolution stage, see "resolve_fl_procedure".  */
          case FL_VARIABLE:
-         case FL_NAMELIST:
          default:
            break;
        }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 81597d20d02153c3f788378dae490176f9398714..5131389e83b453340d675a601a3982496468c9db 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-01-21  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/50556
+       * gfortran.dg/namelist_74.f90: New test.
+       * gfortran.dg/namelist_59.f90: Remove SAVE attribute.
+
 2012-01-21  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/51913

diff --git a/gcc/testsuite/gfortran.dg/namelist_59.f90 b/gcc/testsuite/gfortran.dg/namelist_59.f90
index bb68b9bebe937e5b321612893768bae435414560..f69a49a55345661f308786d3f41ab43e3b8511c7 100644 (file)
--- a/gcc/testsuite/gfortran.dg/namelist_59.f90
+++ b/gcc/testsuite/gfortran.dg/namelist_59.f90
@@ -16,7 +16,6 @@ subroutine process(string)
  integer :: i=1,j=2,k=3
  integer ios
  namelist /cmd/ i,j,k
- save cmd
  lines(1)='&cmd'
  lines(2)=string
  lines(3)='/'

diff --git a/gcc/testsuite/gfortran.dg/namelist_74.f90 b/gcc/testsuite/gfortran.dg/namelist_74.f90
new file mode 100644 (file)
index 0000000..520c7ab
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/namelist_74.f90
@@ -0,0 +1,10 @@
+! { dg-do compile }
+! PR fortran/50556
+subroutine foo
+   save i
+   namelist /i/ ii    ! { dg-error "cannot have the SAVE attribute" }
+end subroutine foo
+subroutine bar
+   namelist /i/ ii
+   save i             ! { dg-error "cannot have the SAVE attribute" }
+end subroutine bar