diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2015-09-10 09:32:54 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2015-09-10 09:32:54 +0200 |
| commit | cbdfbde871992d05f9fbd6118196f5eeadfc91e6 (patch) | |
| tree | 73b8b7ec10420ebc8087e34c4750882b8b166950 /gcc | |
| parent | 2ee10f818d0ae2d421ff6df19923acf509d71721 (diff) | |
| download | gcc-cbdfbde871992d05f9fbd6118196f5eeadfc91e6.zip gcc-cbdfbde871992d05f9fbd6118196f5eeadfc91e6.tar.gz gcc-cbdfbde871992d05f9fbd6118196f5eeadfc91e6.tar.bz2 | |
re PR middle-end/67521 (ICE when OpenMP loop expressions mention the IV)
PR middle-end/67521
* gimplify.c (gimplify_omp_for): Don't call omp_add_variable
if decl is already in outer->variables.
* c-c++-common/gomp/pr67521.c: New test.
From-SVN: r227609
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/gimplify.c | 28 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/gomp/pr67521.c | 20 |
4 files changed, 47 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 89ec6f3..3be0e0a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2015-09-10 Jakub Jelinek <jakub@redhat.com> + PR middle-end/67521 + * gimplify.c (gimplify_omp_for): Don't call omp_add_variable + if decl is already in outer->variables. + PR middle-end/67517 * gimplify.c (gimplify_scan_omp_clauses): Instead of asserting that decl is not specified in octx->variables, diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 2a7da25..5030318 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -7163,10 +7163,16 @@ gimplify_omp_for (tree *expr_p, gimple_seq *pre_p) outer = NULL; if (outer) { - omp_add_variable (outer, decl, - GOVD_LASTPRIVATE | GOVD_SEEN); - if (outer->outer_context) - omp_notice_variable (outer->outer_context, decl, true); + n = splay_tree_lookup (outer->variables, + (splay_tree_key)decl); + if (n == NULL || (n->value & GOVD_DATA_SHARE_CLASS) == 0) + { + omp_add_variable (outer, decl, + GOVD_LASTPRIVATE | GOVD_SEEN); + if (outer->outer_context) + omp_notice_variable (outer->outer_context, decl, + true); + } } } } @@ -7201,10 +7207,16 @@ gimplify_omp_for (tree *expr_p, gimple_seq *pre_p) outer = NULL; if (outer) { - omp_add_variable (outer, decl, - GOVD_LASTPRIVATE | GOVD_SEEN); - if (outer->outer_context) - omp_notice_variable (outer->outer_context, decl, true); + n = splay_tree_lookup (outer->variables, + (splay_tree_key)decl); + if (n == NULL || (n->value & GOVD_DATA_SHARE_CLASS) == 0) + { + omp_add_variable (outer, decl, + GOVD_LASTPRIVATE | GOVD_SEEN); + if (outer->outer_context) + omp_notice_variable (outer->outer_context, decl, + true); + } } } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7f00368..e055c44 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2015-09-10 Jakub Jelinek <jakub@redhat.com> + PR middle-end/67521 + * c-c++-common/gomp/pr67521.c: New test. + PR middle-end/67517 * c-c++-common/gomp/pr67517.c: New test. diff --git a/gcc/testsuite/c-c++-common/gomp/pr67521.c b/gcc/testsuite/c-c++-common/gomp/pr67521.c new file mode 100644 index 0000000..b34c117 --- /dev/null +++ b/gcc/testsuite/c-c++-common/gomp/pr67521.c @@ -0,0 +1,20 @@ +/* PR middle-end/67521 */ +/* { dg-do compile } */ +/* { dg-options "-fopenmp" } */ + +void +foo (int x) +{ + int i = 0; + #pragma omp parallel for simd + for (i = (i & x); i < 10; i = i + 2) + ; + i = 0; + #pragma omp parallel for simd + for (i = 0; i < (i & x) + 10; i = i + 2) + ; + i = 0; + #pragma omp parallel for simd + for (i = 0; i < 10; i = i + ((i & x) + 2)) + ; +} |