[gcc/devel/omp/gcc-11] Revert "GCC11 - Fortran: combined directives - order(concurrent) not on distribute"

[Tobias Burnus <burnus@gcc.gnu.org>]

https://gcc.gnu.org/g:43bef50a0d795cde19b412b81629e9219033ba04

commit 43bef50a0d795cde19b412b81629e9219033ba04
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Mon Sep 20 17:26:57 2021 +0200

    Revert "GCC11 - Fortran: combined directives - order(concurrent) not on distribute"
    
    This reverts commit b1dc26d3543d79805751c26ba5b142eeeb1f55b8.
    Reason: This only applies to GCC 11 and is superceeded to a GCC 12 patch,
    which will be cherry-picked in the next commit.

Diff:
---
 gcc/fortran/trans-openmp.c                         |  2 ++
 .../gomp/distribute-order-concurrent.f90           | 25 ----------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c
index 27cc09ed1fe..9d455efee42 100644
--- a/gcc/fortran/trans-openmp.c
+++ b/gcc/fortran/trans-openmp.c
@@ -5927,6 +5927,8 @@ gfc_split_omp_clauses (gfc_code *code,
 	  /* Duplicate collapse.  */
 	  clausesa[GFC_OMP_SPLIT_DISTRIBUTE].collapse
 	    = code->ext.omp_clauses->collapse;
+	  clausesa[GFC_OMP_SPLIT_DISTRIBUTE].order_concurrent
+	    = code->ext.omp_clauses->order_concurrent;
 	}
       if (mask & GFC_OMP_MASK_PARALLEL)
 	{
diff --git a/gcc/testsuite/gfortran.dg/gomp/distribute-order-concurrent.f90 b/gcc/testsuite/gfortran.dg/gomp/distribute-order-concurrent.f90
deleted file mode 100644
index 9597d913684..00000000000
--- a/gcc/testsuite/gfortran.dg/gomp/distribute-order-concurrent.f90
+++ /dev/null
@@ -1,25 +0,0 @@
-! { dg-additional-options "-fdump-tree-original" }
-!
-! In OpenMP 5.0, 'order(concurrent)' does not apply to distribute
-! Ensure that it is rejected in GCC 11.
-! 
-! Note: OpenMP 5.1 allows it; the GCC 12 testcase for it is gfortran.dg/gomp/order-5.f90
-
-subroutine f(a)
-implicit none
-integer :: i, thr
-!save :: thr
-integer :: a(:)
-
-!$omp distribute parallel do order(concurrent) private(thr)
-  do i = 1, 10
-    thr = 5
-    a(i) = thr
-  end do
-!$omp end distribute parallel do
-end
-
-! { dg-final { scan-tree-dump-not "omp distribute\[^\n\r]*order" "original" } }
-! { dg-final { scan-tree-dump "#pragma omp distribute\[\n\r\]" "original" } }
-! { dg-final { scan-tree-dump "#pragma omp parallel private\\(thr\\)" "original" } }
-! { dg-final { scan-tree-dump "#pragma omp for nowait order\\(concurrent\\)" "original" } }