diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-05-17 10:35:01 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2006-05-17 10:35:01 +0200 |
| commit | 761041be912de3a0344a507dbb718a49a9c19434 (patch) | |
| tree | 7de49861b990eff224e646e29a3ad1dd59004468 /gcc/cp | |
| parent | 3c5cbea7a14ac6b674443a6d3e0865a696af18ce (diff) | |
| download | gcc-761041be912de3a0344a507dbb718a49a9c19434.zip gcc-761041be912de3a0344a507dbb718a49a9c19434.tar.gz gcc-761041be912de3a0344a507dbb718a49a9c19434.tar.bz2 | |
re PR middle-end/27415 (Iteration var in firstprivate or reduction clauses not reported)
PR middle-end/27415
* tree.h (OMP_PARALLEL_COMBINED): Define.
* gimplify.c (struct gimplify_omp_ctx): Add is_combined_parallel field.
(new_omp_context): Add is_combined_parallel argument.
(gimplify_scan_omp_clauses): Add in_combined_parallel argument, adjust
new_omp_context caller.
(gimplify_omp_parallel, gimplify_omp_for, gimplify_omp_workshare):
Adjust gimplify_scan_omp_clauses callers.
(omp_is_private): Issue errors if iteration variable is firstprivate
or reduction in the current context.
* c-parser.c (c_parser_omp_parallel): Set OMP_PARALLEL_COMBINED
on combined parallel workshare constructs.
cp/
* parser.c (cp_parser_omp_parallel): Set OMP_PARALLEL_COMBINED
on combined parallel workshare constructs.
* pt.c (tsubst_expr): Copy OMP_PARALLEL_COMBINED flag.
fortran/
* trans-openmp.c (gfc_trans_omp_parallel_do,
gfc_trans_omp_parallel_sections, gfc_trans_omp_parallel_workshare): Set
OMP_PARALLEL_COMBINED flag.
testsuite/
* gcc.dg/gomp/pr27415.c: New test.
* g++.dg/gomp/pr27415.C: New test.
From-SVN: r113846
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 698ae1a..8a31857 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2006-05-17 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/27415 + * parser.c (cp_parser_omp_parallel): Set OMP_PARALLEL_COMBINED + on combined parallel workshare constructs. + * pt.c (tsubst_expr): Copy OMP_PARALLEL_COMBINED flag. + 2006-05-16 H.J. Lu <hongjiu.lu@intel.com> PR driver/26885 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index c89c357..28c5007 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18842,7 +18842,10 @@ cp_parser_omp_parallel (cp_parser *parser, cp_token *pragma_tok) } cp_parser_end_omp_structured_block (parser, save); - return finish_omp_parallel (par_clause, block); + stmt = finish_omp_parallel (par_clause, block); + if (p_kind != PRAGMA_OMP_PARALLEL) + OMP_PARALLEL_COMBINED (stmt) = 1; + return stmt; } /* OpenMP 2.5: diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 7bbc2cc..ea3ff41 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -8456,7 +8456,8 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) args, complain, in_decl); stmt = begin_omp_parallel (); tsubst_expr (OMP_PARALLEL_BODY (t), args, complain, in_decl); - finish_omp_parallel (tmp, stmt); + OMP_PARALLEL_COMBINED (finish_omp_parallel (tmp, stmt)) + = OMP_PARALLEL_COMBINED (t); break; case OMP_FOR: |