diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-06-21 14:11:00 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2007-06-21 14:11:00 +0200 |
| commit | 64964499f48e337bf90d0e9d75fc44741b133194 (patch) | |
| tree | c5c2af76013fd82cf833725a5732c73bb1bd9903 /gcc | |
| parent | d9eb5318b600dc6aec71b231f38fbb16b100359d (diff) | |
| download | gcc-64964499f48e337bf90d0e9d75fc44741b133194.zip gcc-64964499f48e337bf90d0e9d75fc44741b133194.tar.gz gcc-64964499f48e337bf90d0e9d75fc44741b133194.tar.bz2 | |
re PR middle-end/32362 (ICE: in lookup_decl_in_outer_ctx, at omp-low.c:1508)
PR middle-end/32362
* omp-low.c (lookup_decl_in_outer_ctx): Don't ICE if t is NULL,
but decl is a global var, instead return decl.
* gimplify.c (gimplify_adjust_omp_clauses_1): Add shared clauses
even for is_global_var decls, if they are private in some outer
context.
* testsuite/libgomp.c/pr32362-1.c: New test.
* testsuite/libgomp.c/pr32362-2.c: New test.
* testsuite/libgomp.c/pr32362-3.c: New test.
From-SVN: r125917
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/gimplify.c | 15 | ||||
| -rw-r--r-- | gcc/omp-low.c | 4 |
3 files changed, 25 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 90c40a2..cabe8b9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2007-06-21 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/32362 + * omp-low.c (lookup_decl_in_outer_ctx): Don't ICE if t is NULL, + but decl is a global var, instead return decl. + * gimplify.c (gimplify_adjust_omp_clauses_1): Add shared clauses + even for is_global_var decls, if they are private in some outer + context. + 2007-06-21 Richard Guenther <rguenther@suse.de> PR tree-optimization/32451 diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 01ccaf0..c93bb44 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -4882,7 +4882,20 @@ gimplify_adjust_omp_clauses_1 (splay_tree_node n, void *data) else if (flags & GOVD_SHARED) { if (is_global_var (decl)) - return 0; + { + struct gimplify_omp_ctx *ctx = gimplify_omp_ctxp->outer_context; + while (ctx != NULL) + { + splay_tree_node on + = splay_tree_lookup (ctx->variables, (splay_tree_key) decl); + if (on && (on->value & (GOVD_FIRSTPRIVATE | GOVD_LASTPRIVATE + | GOVD_PRIVATE | GOVD_REDUCTION)) != 0) + break; + ctx = ctx->outer_context; + } + if (ctx == NULL) + return 0; + } code = OMP_CLAUSE_SHARED; } else if (flags & GOVD_PRIVATE) diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 5b1f3c4c..700645f 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -1504,9 +1504,9 @@ lookup_decl_in_outer_ctx (tree decl, omp_context *ctx) for (up = ctx->outer, t = NULL; up && t == NULL; up = up->outer) t = maybe_lookup_decl (decl, up); - gcc_assert (t); + gcc_assert (t || is_global_var (decl)); - return t; + return t ? t : decl; } |