re PR middle-end/89002 (ICE in scan_omp_1_op, at omp-low.c:3166)

	PR middle-end/89002
	* gimplify.c (gimplify_omp_for): When adding OMP_CLAUSE_*_GIMPLE_SEQ
	for lastprivate/linear IV, push gimplify context around gimplify_assign
	and, if it needed any temporaries, pop it into a gimple bind around the
	sequence.

	* testsuite/libgomp.c/pr89002.c: New test.

From-SVN: r268345

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b4479132090120da5c285470f1a72679e5c1fe56..f5872dbeab7c2c24fe3172a30d87f21ffa6d78b8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2019-01-28  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/89002
+       * gimplify.c (gimplify_omp_for): When adding OMP_CLAUSE_*_GIMPLE_SEQ
+       for lastprivate/linear IV, push gimplify context around gimplify_assign
+       and, if it needed any temporaries, pop it into a gimple bind around the
+       sequence.
+
 2019-01-28  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
        * common.opt (-Wattribute-alias): Remove "no-" from name.

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 59166783eddffeef9c8fb66737c4e748d5571f67..7e37e500d810a015a8ee5e7e05657a7b59c5b94d 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -11167,8 +11167,17 @@ gimplify_omp_for (tree *expr_p, gimple_seq *pre_p)
                  seq = &OMP_CLAUSE_LASTPRIVATE_GIMPLE_SEQ (c);
                else
                  seq = &OMP_CLAUSE_LINEAR_GIMPLE_SEQ (c);
+               push_gimplify_context ();
                gimplify_assign (decl, t, seq);
-           }
+               gimple *bind = NULL;
+               if (gimplify_ctxp->temps)
+                 {
+                   bind = gimple_build_bind (NULL_TREE, *seq, NULL_TREE);
+                   *seq = NULL;
+                   gimplify_seq_add_stmt (seq, bind);
+                 }
+               pop_gimplify_context (bind);
+             }
        }
     }
 

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 5a7d4d8346cd33b154262413c92cc491244b6976..e774e7fc1aeea6cdbb332e37448da362c92e97c9 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-28  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/89002
+       * testsuite/libgomp.c/pr89002.c: New test.
+
 2019-01-28  Richard Biener  <rguenther@suse.de>
 
        PR testsuite/89064

diff --git a/libgomp/testsuite/libgomp.c/pr89002.c b/libgomp/testsuite/libgomp.c/pr89002.c
new file mode 100644 (file)
index 0000000..b66fada
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c/pr89002.c
@@ -0,0 +1,86 @@
+/* PR middle-end/89002 */
+
+extern void abort (void);
+
+int
+foo (int x)
+{
+  int a;
+  int *p = &a;
+
+#pragma omp taskloop lastprivate (a)
+  for (a = 0; a < x; ++a)
+    ;
+  return *p;
+}
+
+int
+bar (int x)
+{
+  int a;
+  int *p = &a;
+
+#pragma omp parallel
+#pragma omp single
+#pragma omp taskloop lastprivate (a)
+  for (a = 0; a < x; ++a)
+    ;
+  return *p;
+}
+
+int
+main ()
+{
+#pragma omp parallel
+#pragma omp single
+  {
+    if (foo (4) != 4)
+      abort ();
+  }
+  if (bar (6) != 6)
+    abort ();
+  return 0;
+}
+/* PR middle-end/89002 */
+
+extern void abort (void);
+
+int
+foo (int x)
+{
+  int a;
+  int *p = &a;
+
+#pragma omp taskloop lastprivate (a)
+  for (a = 0; a < x; ++a)
+    ;
+  return *p;
+}
+
+int
+bar (int x)
+{
+  int a;
+  int *p = &a;
+
+#pragma omp parallel
+#pragma omp single
+#pragma omp taskloop lastprivate (a)
+  for (a = 0; a < x; ++a)
+    ;
+  return *p;
+}
+
+int
+main ()
+{
+#pragma omp parallel
+#pragma omp single
+  {
+    if (foo (4) != 4)
+      abort ();
+  }
+  if (bar (6) != 6)
+    abort ();
+  return 0;
+}