[PR88420] Fortran OpenACC "Clause SEQ conflicts with INDEPENDENT"

The Fortran front end declares that the OpenACC "Clause SEQ conflicts with
INDEPENDENT".  While that combination doesn't make too much sense indeed, it's
still valid; these are orthogonal concepts.

	gcc/fortran/
	PR fortran/88420
	* openmp.c (resolve_oacc_loop_blocks): Remove "Clause SEQ
	conflicts with INDEPENDENT" diagnostic.
	gcc/testsuite/
	PR fortran/88420
	* gfortran.dg/goacc/loop-1-2.f95: Update.
	* gfortran.dg/goacc/loop-1.f95: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266920 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7ae21ac7d808fe89451c61e6d3c2adad2c6ac32f..ae1871ec7f8dd4d92ec68eb2f8b7766b2b9dd3b4 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-09  Thomas Schwinge  <thomas@codesourcery.com>
+
+       PR fortran/88420
+       * openmp.c (resolve_oacc_loop_blocks): Remove "Clause SEQ
+       conflicts with INDEPENDENT" diagnostic.
+
 2018-12-08  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/88048

diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index fb9c073ff779cfaec028d6fbaf1daf546722886b..d97b8bfbb142a3fc205a984a404ddd1d1000f146 100644 (file)
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -5895,8 +5895,6 @@ resolve_oacc_loop_blocks (gfc_code *code)
 
   if (code->ext.omp_clauses->seq)
     {
-      if (code->ext.omp_clauses->independent)
-       gfc_error ("Clause SEQ conflicts with INDEPENDENT at %L", &code->loc);
       if (code->ext.omp_clauses->gang)
        gfc_error ("Clause SEQ conflicts with GANG at %L", &code->loc);
       if (code->ext.omp_clauses->worker)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0cbe4e26bb2eafa0bdb4412ee1f6e8d0da049288..5656259cbbad32b795e9fa4f604c37d519f0e7e4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-09  Thomas Schwinge  <thomas@codesourcery.com>
+
+       PR fortran/88420
+       * gfortran.dg/goacc/loop-1-2.f95: Update.
+       * gfortran.dg/goacc/loop-1.f95: Likewise.
+
 2018-12-08  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        PR fortran/88048

diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95
index f89687aab43be5657c439a3441f480308d2cec99..e048205d2c3892b5b13a178ddd1c8d7d87754b50 100644 (file)
--- a/gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95
@@ -152,8 +152,7 @@ subroutine test1
         ! { dg-error "ACC LOOP iteration variable must be of type integer" "" { target *-*-* } 150 }
     end do
 
-    ! Both seq and independent are not allowed
-  !$acc loop independent seq ! { dg-error "SEQ conflicts with INDEPENDENT" }
+  !$acc loop independent seq
   do i = 1,10
   enddo
 

diff --git a/gcc/testsuite/gfortran.dg/goacc/loop-1.f95 b/gcc/testsuite/gfortran.dg/goacc/loop-1.f95
index e51c9a40f9237ce739aba8244602a08e6fc36e66..776fa482af3cb59ba3d5f28f475111a28edadb23 100644 (file)
--- a/gcc/testsuite/gfortran.dg/goacc/loop-1.f95
+++ b/gcc/testsuite/gfortran.dg/goacc/loop-1.f95
@@ -152,8 +152,7 @@ subroutine test1
         ! { dg-error "ACC LOOP iteration variable must be of type integer" "" { target *-*-* } 150 }
     end do
 
-    ! Both seq and independent are not allowed
-  !$acc loop independent seq ! { dg-error "SEQ conflicts with INDEPENDENT" }
+  !$acc loop independent seq
   do i = 1,10
   enddo