Hi!
The standard says that "The event-handle will be considered as if it
was specified on a firstprivate clause." which means that it can't
be explicitly specified in some other data-sharing clause.
The checking is implemented correctly for C, but for C++ when detach_seen
is true (i.e. the construct had detach clause) we were comparing
OMP_CLAUSE_DECL (c) with t, which was previously initialized to
OMP_CLAUSE_DECL (c), which means it complained about any explicit
data-sharing clause on the same construct with a detach clause.
Fixed by remembering the detach clause in detach_seen (instead of a boolean
flag) and comparing against its OMP_CLAUSE_DECL.
Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.
2021-04-29 Jakub Jelinek <ja...@redhat.com>
PR c++/100319
* semantics.c (finish_omp_clauses): Fix up check that variable
mentioned in detach clause doesn't appear in data-sharing clauses.
* c-c++-common/gomp/task-detach-3.c: New test.
--- gcc/cp/semantics.c.jj 2021-04-15 10:40:33.380919956 +0200
+++ gcc/cp/semantics.c 2021-04-28 17:11:07.325684916 +0200
@@ -6527,7 +6527,7 @@ finish_omp_clauses (tree clauses, enum c
has been seen, -2 if mixed inscan/normal reduction diagnosed. */
int reduction_seen = 0;
bool allocate_seen = false;
- bool detach_seen = false;
+ tree detach_seen = NULL_TREE;
bool mergeable_seen = false;
bitmap_obstack_initialize (NULL);
@@ -7578,7 +7578,7 @@ finish_omp_clauses (tree clauses, enum c
type);
remove = true;
}
- detach_seen = true;
+ detach_seen = c;
cxx_mark_addressable (t);
}
break;
@@ -8548,7 +8548,7 @@ finish_omp_clauses (tree clauses, enum c
|| OMP_CLAUSE_CODE (c) == OMP_CLAUSE_PRIVATE
|| OMP_CLAUSE_CODE (c) == OMP_CLAUSE_FIRSTPRIVATE
|| OMP_CLAUSE_CODE (c) == OMP_CLAUSE_LASTPRIVATE)
- && OMP_CLAUSE_DECL (c) == t)
+ && OMP_CLAUSE_DECL (c) == OMP_CLAUSE_DECL (detach_seen))
{
error_at (OMP_CLAUSE_LOCATION (c),
"the event handle of a %<detach%> clause "
--- gcc/testsuite/c-c++-common/gomp/task-detach-3.c.jj 2021-04-28
17:11:07.326684905 +0200
+++ gcc/testsuite/c-c++-common/gomp/task-detach-3.c 2021-04-28
17:11:29.594436563 +0200
@@ -0,0 +1,19 @@
+/* PR c++/100319 */
+/* { dg-do compile } */
+/* { dg-options "-fopenmp" } */
+
+typedef enum omp_event_handle_t
+{
+ __omp_event_handle_t_max__ = __UINTPTR_MAX__
+} omp_event_handle_t;
+
+extern void omp_fulfill_event (omp_event_handle_t);
+
+void f (omp_event_handle_t x, omp_event_handle_t y, int z)
+{
+ #pragma omp task detach (x) firstprivate (y, z) /* { dg-bogus "the
event handle of a 'detach' clause should not be in a data-sharing clause" } */
+ ;
+
+ #pragma omp task detach (x) shared (y) /* { dg-bogus "the
event handle of a 'detach' clause should not be in a data-sharing clause" } */
+ ;
+}
Jakub
