re PR fortran/63514 (functions containing volatile are considered pure)

2018-06-09  Steven G. Kargl  <kargl@gcc.gnu.org>

 PR fortran/63514
 * symbol.c (gfc_add_volatile): Enforce F2008:C1282 and F2018:C1588.

2018-06-09  Steven G. Kargl  <kargl@gcc.gnu.org>

 PR fortran/63514
 * gfortran.dg/pr63514.f90: New test.

From-SVN: r261360

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index dbda6ef58d66972dcd5e97443a977d10fba62ddc..5f1ed3bc75d49d9a1bad85c44266f47fa39868b0 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-09  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/63514
+       * symbol.c (gfc_add_volatile): Enforce F2008:C1282 and F2018:C1588.
+
 2018-06-08  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR fortran/85631

diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index 4f060633da113f8fbcf47a3b5216f4e09f8fe849..b4a950aa4af9c212fda1117804901e8afb96b1eb 100644 (file)
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -1349,6 +1349,20 @@ gfc_add_volatile (symbol_attribute *attr, const char *name, locus *where)
                         where))
       return false;
 
+  /* F2008:  C1282 A designator of a variable with the VOLATILE attribute
+     shall not appear in a pure subprogram.
+
+     F2018: C1588 A local variable of a pure subprogram, or of a BLOCK
+     construct within a pure subprogram, shall not have the SAVE or
+     VOLATILE attribute.  */
+  if (gfc_pure (NULL))
+    {
+      gfc_error ("VOLATILE attribute at %L cannot be specified in a "
+                "PURE procedure", where);
+      return false;
+    }
+
+
   attr->volatile_ = 1;
   attr->volatile_ns = gfc_current_ns;
   return check_conflict (attr, name, where);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8b9b37f19703b6a604be04f9ad4bb775289dac8d..36135a88521afd56bf65854a91c192dbc39679ed 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2018-06-09  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/63514
+       * gfortran.dg/pr63514.f90: New test.
+
 2018-06-08  Thomas Koenig  <tkoenig@gcc.gnu.org>
 
        PR fortran/85631

diff --git a/gcc/testsuite/gfortran.dg/pr63514.f90 b/gcc/testsuite/gfortran.dg/pr63514.f90
new file mode 100644 (file)
index 0000000..389fb92
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr63514.f90
@@ -0,0 +1,41 @@
+! { dg-do compile }
+! PR fortran/63514.f90
+program foo
+
+   implicit none
+
+   integer, volatile :: n
+
+   n = 0
+
+   call bar
+   call bah
+
+   contains
+
+   subroutine bar
+      integer k
+      integer, volatile :: m
+      block
+         integer, save :: i
+         integer, volatile :: j
+         i = 42
+         j = 2 * i
+         k = i + j + n
+      end block
+   end subroutine bar
+
+   pure subroutine bah
+      integer k
+      integer, volatile :: m     ! { dg-error "cannot be specified in a PURE" }
+      block
+         integer, save :: i      ! { dg-error "cannot be specified in a PURE" }
+         integer, volatile :: j  ! { dg-error "cannot be specified in a PURE" }
+         i = 42                  ! { dg-error "has no IMPLICIT type" }
+         j = 2 * i               ! { dg-error "has no IMPLICIT type" }
+         k = i + j + n
+      end block
+      m = k * m                  ! { dg-error "has no IMPLICIT type" }
+   end subroutine bah
+
+end program foo