diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-06-12 23:10:11 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-06-12 23:10:11 +0200 |
| commit | 9cf32741aabefe8fa90bad887b694dbf7ad29726 (patch) | |
| tree | c4172ecef31a5a6826c56350eb72c44c9d78516b /gcc/omp-low.c | |
| parent | 62984918665f0c82b187293ba762bc2edb32ab92 (diff) | |
| download | gcc-9cf32741aabefe8fa90bad887b694dbf7ad29726.zip gcc-9cf32741aabefe8fa90bad887b694dbf7ad29726.tar.gz gcc-9cf32741aabefe8fa90bad887b694dbf7ad29726.tar.bz2 | |
re PR middle-end/61486 (ICE with #pragma omp teams)
PR middle-end/61486
* gimplify.c (struct gimplify_omp_ctx): Add distribute field.
(gimplify_adjust_omp_clauses): Don't or in GOVD_LASTPRIVATE
if outer combined construct is distribute.
(gimplify_omp_for): For OMP_DISTRIBUTE set
gimplify_omp_ctxp->distribute.
* omp-low.c (scan_sharing_clauses) <case OMP_CLAUSE_SHARED>: For
GIMPLE_OMP_TEAMS, if decl isn't global in outer context, record
mapping into decl map.
c-family/
* c-omp.c (c_omp_split_clauses): Don't crash on firstprivate in
#pragma omp target teams or
#pragma omp {,target }teams distribute simd.
testsuite/
* c-c++-common/gomp/pr61486-1.c: New test.
* c-c++-common/gomp/pr61486-2.c: New test.
From-SVN: r211596
Diffstat (limited to 'gcc/omp-low.c')
| -rw-r--r-- | gcc/omp-low.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gcc/omp-low.c b/gcc/omp-low.c index ddb049d..67254cc 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -1509,11 +1509,19 @@ scan_sharing_clauses (tree clauses, omp_context *ctx) break; case OMP_CLAUSE_SHARED: + decl = OMP_CLAUSE_DECL (c); /* Ignore shared directives in teams construct. */ if (gimple_code (ctx->stmt) == GIMPLE_OMP_TEAMS) - break; + { + /* Global variables don't need to be copied, + the receiver side will use them directly. */ + tree odecl = maybe_lookup_decl_in_outer_ctx (decl, ctx); + if (is_global_var (odecl)) + break; + insert_decl_map (&ctx->cb, decl, odecl); + break; + } gcc_assert (is_taskreg_ctx (ctx)); - decl = OMP_CLAUSE_DECL (c); gcc_assert (!COMPLETE_TYPE_P (TREE_TYPE (decl)) || !is_variable_sized (decl)); /* Global variables don't need to be copied, |