backport: re PR middle-end/81768 (error: control flow in the middle of basic block)

	Backported from mainline
	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.

	* gcc.dg/gomp/pr81768-2.c: New test.

From-SVN: r252861

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4913dd0dddc303c5e24d38818eb79db9ae3ddf2d..e765a1f45818a7a55cb7aba239238c61ae8831c7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,10 @@
        Backported from mainline
        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-low.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 3bff0ac575fb72789cd9235769dc252ad15b7374..22d6ab9ea5f7abaa226c3a18ef827e025dd9cac0 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -15181,10 +15181,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 6c0d28746e9aca7b50a96950ddf7dd039b671c95..1ec5e3fe8891a23588eb80b97dfc1a718b85b81c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
        Backported from mainline
        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.
 

diff --git a/gcc/testsuite/gcc.dg/gomp/pr81768-2.c b/gcc/testsuite/gcc.dg/gomp/pr81768-2.c
new file mode 100644 (file)
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;
+}