diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-09-05 23:32:35 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-09-05 23:32:35 +0200 |
| commit | 0fe4bc787a5dccb0d22ee3872cfeb5c4663b144b (patch) | |
| tree | 5df424d34db5c6d8618697d77d9b105f1c31609c /gcc | |
| parent | bcc6842ba5563b075ed2946de20151928f572aca (diff) | |
| download | gcc-0fe4bc787a5dccb0d22ee3872cfeb5c4663b144b.zip gcc-0fe4bc787a5dccb0d22ee3872cfeb5c4663b144b.tar.gz gcc-0fe4bc787a5dccb0d22ee3872cfeb5c4663b144b.tar.bz2 | |
re PR middle-end/81768 (error: control flow in the middle of basic block)
PR middle-end/81768
* omp-low.c (lower_omp_for): Recompute tree invariant if
gimple_omp_for_initial/final is ADDR_EXPR.
* gcc.dg/gomp/pr81768-2.c: New test.
From-SVN: r251742
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/omp-low.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/gomp/pr81768-2.c | 15 |
4 files changed, 26 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 95ecb3c..5363790 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,10 @@ 2017-09-05 Jakub Jelinek <jakub@redhat.com> PR middle-end/81768 + * omp-low.c (lower_omp_for): Recompute tree invariant if + gimple_omp_for_initial/final is ADDR_EXPR. + + PR middle-end/81768 * omp-expand.c (expand_omp_simd): Force second operands of COND_EXPR into gimple val before gimplification fo the COND_EXPR. diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 080f2f4..8ed8f7c 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -6923,10 +6923,14 @@ lower_omp_for (gimple_stmt_iterator *gsi_p, omp_context *ctx) rhs_p = gimple_omp_for_initial_ptr (stmt, i); if (!is_gimple_min_invariant (*rhs_p)) *rhs_p = get_formal_tmp_var (*rhs_p, &body); + else if (TREE_CODE (*rhs_p) == ADDR_EXPR) + recompute_tree_invariant_for_addr_expr (*rhs_p); rhs_p = gimple_omp_for_final_ptr (stmt, i); if (!is_gimple_min_invariant (*rhs_p)) *rhs_p = get_formal_tmp_var (*rhs_p, &body); + else if (TREE_CODE (*rhs_p) == ADDR_EXPR) + recompute_tree_invariant_for_addr_expr (*rhs_p); rhs_p = &TREE_OPERAND (gimple_omp_for_incr (stmt, i), 1); if (!is_gimple_min_invariant (*rhs_p)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e470ff1..667d1cb 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,9 @@ 2017-09-05 Jakub Jelinek <jakub@redhat.com> PR middle-end/81768 + * gcc.dg/gomp/pr81768-2.c: New test. + + PR middle-end/81768 * gcc.dg/gomp/pr81768-1.c: New test. 2017-09-05 Bill Schmidt <wschmidt@linux.vnet.ibm.com> diff --git a/gcc/testsuite/gcc.dg/gomp/pr81768-2.c b/gcc/testsuite/gcc.dg/gomp/pr81768-2.c new file mode 100644 index 0000000..64ae66f --- /dev/null +++ b/gcc/testsuite/gcc.dg/gomp/pr81768-2.c @@ -0,0 +1,15 @@ +/* PR middle-end/81768 */ +/* { dg-do compile } */ + +float b[10][15][10]; + +void +foo (void) +{ + float *i; +#pragma omp target parallel for schedule(static, 32) collapse(3) + for (i = &b[0][0][0]; i < &b[0][0][10]; i++) + for (float *j = &b[0][15][0]; j > &b[0][0][0]; j -= 10) + for (float *k = &b[0][0][10]; k > &b[0][0][0]; --k) + b[i - &b[0][0][0]][(j - &b[0][0][0]) / 10 - 1][(k - &b[0][0][0]) - 1] -= 3.5; +} |