This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

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


Hi!

Other release branches probably likewise affected; for now committed to
trunk in r266920:

commit 7e5550c06d7ce70887a5042d07f1d9a76706b582
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Sun Dec 9 12:47:35 2018 +0000

    [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
---
 gcc/fortran/ChangeLog                        | 6 ++++++
 gcc/fortran/openmp.c                         | 2 --
 gcc/testsuite/ChangeLog                      | 6 ++++++
 gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95 | 3 +--
 gcc/testsuite/gfortran.dg/goacc/loop-1.f95   | 3 +--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git gcc/fortran/ChangeLog gcc/fortran/ChangeLog
index 7ae21ac7d808..ae1871ec7f8d 100644
--- gcc/fortran/ChangeLog
+++ 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 gcc/fortran/openmp.c gcc/fortran/openmp.c
index fb9c073ff779..d97b8bfbb142 100644
--- gcc/fortran/openmp.c
+++ 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 gcc/testsuite/ChangeLog gcc/testsuite/ChangeLog
index 0cbe4e26bb2e..5656259cbbad 100644
--- gcc/testsuite/ChangeLog
+++ 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 gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95 gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95
index f89687aab43b..e048205d2c38 100644
--- gcc/testsuite/gfortran.dg/goacc/loop-1-2.f95
+++ 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 gcc/testsuite/gfortran.dg/goacc/loop-1.f95 gcc/testsuite/gfortran.dg/goacc/loop-1.f95
index e51c9a40f923..776fa482af3c 100644
--- gcc/testsuite/gfortran.dg/goacc/loop-1.f95
+++ 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
 


Grüße
 Thomas


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]