aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2019-07-13 08:29:46 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2019-07-13 08:29:46 +0200
commit1a888209de88d4a4a1f415beb28e5a94b95e088f (patch)
tree7bd031afd9f9794d45465048da220b4ede473266
parent704686049d5eb2d54fe62585d2c17c5ef00dbb83 (diff)
downloadgcc-1a888209de88d4a4a1f415beb28e5a94b95e088f.zip
gcc-1a888209de88d4a4a1f415beb28e5a94b95e088f.tar.gz
gcc-1a888209de88d4a4a1f415beb28e5a94b95e088f.tar.bz2
re PR c/91149 (GCC 9 and later incorrectly rejects OpenMP task reduction-modifier on target parallel combined construct)
PR c/91149 * c-omp.c (c_omp_split_clauses): Fix a pasto in OMP_CLAUSE_REDUCTION_TASK handling. * c-c++-common/gomp/reduction-task-3.c: New test. From-SVN: r273465
-rw-r--r--gcc/c-family/ChangeLog6
-rw-r--r--gcc/c-family/c-omp.c2
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/c-c++-common/gomp/reduction-task-3.c12
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index b84e1f5..d360759 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2019-07-13 Jakub Jelinek <jakub@redhat.com>
+
+ PR c/91149
+ * c-omp.c (c_omp_split_clauses): Fix a pasto in
+ OMP_CLAUSE_REDUCTION_TASK handling.
+
2019-07-12 Jakub Jelinek <jakub@redhat.com>
* c-pragma.h (enum pragma_omp_clause): Add PRAGMA_OMP_CLAUSE_ORDER.
diff --git a/gcc/c-family/c-omp.c b/gcc/c-family/c-omp.c
index fc08e93..dc59bd2 100644
--- a/gcc/c-family/c-omp.c
+++ b/gcc/c-family/c-omp.c
@@ -1667,7 +1667,7 @@ c_omp_split_clauses (location_t loc, enum tree_code code,
}
else if (code != OMP_SECTIONS
&& (mask & (OMP_CLAUSE_MASK_1
- << PRAGMA_OMP_CLAUSE_SCHEDULE)) == 0
+ << PRAGMA_OMP_CLAUSE_NUM_THREADS)) == 0
&& (mask & (OMP_CLAUSE_MASK_1
<< PRAGMA_OMP_CLAUSE_SCHEDULE)) == 0)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dccf6ee..22cd660 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2019-07-13 Jakub Jelinek <jakub@redhat.com>
+ PR c/91149
+ * c-c++-common/gomp/reduction-task-3.c: New test.
+
* c-c++-common/gomp/order-3.c: New test.
* c-c++-common/gomp/order-4.c: New test.
diff --git a/gcc/testsuite/c-c++-common/gomp/reduction-task-3.c b/gcc/testsuite/c-c++-common/gomp/reduction-task-3.c
new file mode 100644
index 0000000..bde2ccb
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/reduction-task-3.c
@@ -0,0 +1,12 @@
+/* PR c/91149 */
+
+int r;
+
+void
+foo (void)
+{
+ #pragma omp parallel reduction(task, +: r)
+ r++;
+ #pragma omp target parallel reduction(task, +: r)
+ r++;
+}