diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-11-04 09:37:22 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2020-11-04 10:02:01 +0100 |
| commit | 9649031577028310e853025672c71dfb500494f0 (patch) | |
| tree | 77628998c8b1cfcf5d767872248ff33542eff532 /gcc/c | |
| parent | 7988c76ebacd66741110886c3dc7a4f0245ba9b5 (diff) | |
| download | gcc-9649031577028310e853025672c71dfb500494f0.zip gcc-9649031577028310e853025672c71dfb500494f0.tar.gz gcc-9649031577028310e853025672c71dfb500494f0.tar.bz2 | |
openmp: allocate clause vs. *reduction array sections [PR97670]
This patch finds the base expression of reduction array sections and uses it
in checks whether allocate clause lists only variables that have been privatized.
Also fixes a pasto that caused an ICE.
2020-11-04 Jakub Jelinek <jakub@redhat.com>
PR c++/97670
gcc/c-family/
* c-omp.c (c_omp_split_clauses): Look through array reductions to find
underlying decl to clear in the allocate_head bitmap.
gcc/c/
* c-typeck.c (c_finish_omp_clauses): Look through array reductions to
find underlying decl to clear in the aligned_head bitmap.
gcc/cp/
* semantics.c (finish_omp_clauses): Look through array reductions to
find underlying decl to clear in the aligned_head bitmap. Use
DECL_UID (t) instead of DECL_UID (OMP_CLAUSE_DECL (c)) when clearing
in the bitmap. Only diagnose errors about allocate vars not being
privatized on the same construct on allocate clause if it has
a DECL_P OMP_CLAUSE_DECL.
gcc/testsuite/
* c-c++-common/gomp/allocate-4.c: New test.
* g++.dg/gomp/allocate-2.C: New test.
* g++.dg/gomp/allocate-3.C: New test.
Diffstat (limited to 'gcc/c')
| -rw-r--r-- | gcc/c/c-typeck.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c index 0d75ed4..2bf46f4 100644 --- a/gcc/c/c-typeck.c +++ b/gcc/c/c-typeck.c @@ -15153,13 +15153,26 @@ c_finish_omp_clauses (tree clauses, enum c_omp_region_type ort) if (allocate_seen) switch (OMP_CLAUSE_CODE (c)) { + case OMP_CLAUSE_REDUCTION: + case OMP_CLAUSE_IN_REDUCTION: + case OMP_CLAUSE_TASK_REDUCTION: + if (TREE_CODE (OMP_CLAUSE_DECL (c)) == MEM_REF) + { + t = TREE_OPERAND (OMP_CLAUSE_DECL (c), 0); + if (TREE_CODE (t) == POINTER_PLUS_EXPR) + t = TREE_OPERAND (t, 0); + if (TREE_CODE (t) == ADDR_EXPR + || TREE_CODE (t) == INDIRECT_REF) + t = TREE_OPERAND (t, 0); + if (DECL_P (t)) + bitmap_clear_bit (&aligned_head, DECL_UID (t)); + break; + } + /* FALLTHRU */ case OMP_CLAUSE_PRIVATE: case OMP_CLAUSE_FIRSTPRIVATE: case OMP_CLAUSE_LASTPRIVATE: case OMP_CLAUSE_LINEAR: - case OMP_CLAUSE_REDUCTION: - case OMP_CLAUSE_IN_REDUCTION: - case OMP_CLAUSE_TASK_REDUCTION: if (DECL_P (OMP_CLAUSE_DECL (c))) bitmap_clear_bit (&aligned_head, DECL_UID (OMP_CLAUSE_DECL (c))); |