backport: re PR middle-end/86539 (OpenMP wrong-code with taskloop and references)

	Backported from mainline
	2018-07-17  Jakub Jelinek  <jakub@redhat.com>

	PR middle-end/86539
	* gimplify.c (gimplify_omp_for): Ensure taskloop firstprivatized init
	and cond temporaries don't have reference type if iterator has
	pointer type.  For init use &for_pre_body instead of pre_p if
	for_pre_body is non-empty.

	* testsuite/libgomp.c++/pr86539.C: New test.

From-SVN: r265117

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ebb7f2c19e10ea5648c7396db688278e618eaf7e..5c5459ed8a0aaa6f70b7e983c651fc4bd82e2257 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,14 @@
 2018-10-12  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-07-17  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/86539
+       * gimplify.c (gimplify_omp_for): Ensure taskloop firstprivatized init
+       and cond temporaries don't have reference type if iterator has
+       pointer type.  For init use &for_pre_body instead of pre_p if
+       for_pre_body is non-empty.
+
        2018-07-26  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/86660

diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index e59fa5a68075121cb8cab8c443ee74c53f82be01..1181e8e06a2e0ff9a525e30b92ad76def6934a92 100644 (file)
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -8725,9 +8725,25 @@ gimplify_omp_for (tree *expr_p, gimple_seq *pre_p)
          t = TREE_VEC_ELT (OMP_FOR_INIT (for_stmt), i);
          if (!is_gimple_constant (TREE_OPERAND (t, 1)))
            {
+             tree type = TREE_TYPE (TREE_OPERAND (t, 0));
              TREE_OPERAND (t, 1)
                = get_initialized_tmp_var (TREE_OPERAND (t, 1),
-                                          pre_p, NULL);
+                                          gimple_seq_empty_p (for_pre_body)
+                                          ? pre_p : &for_pre_body, NULL);
+             /* Reference to pointer conversion is considered useless,
+                but is significant for firstprivate clause.  Force it
+                here.  */
+             if (TREE_CODE (type) == POINTER_TYPE
+                 && (TREE_CODE (TREE_TYPE (TREE_OPERAND (t, 1)))
+                     == REFERENCE_TYPE))
+               {
+                 tree v = create_tmp_var (TYPE_MAIN_VARIANT (type));
+                 tree m = build2 (INIT_EXPR, TREE_TYPE (v), v,
+                                  TREE_OPERAND (t, 1));
+                 gimplify_and_add (m, gimple_seq_empty_p (for_pre_body)
+                                      ? pre_p : &for_pre_body);
+                 TREE_OPERAND (t, 1) = v;
+               }
              tree c = build_omp_clause (input_location,
                                         OMP_CLAUSE_FIRSTPRIVATE);
              OMP_CLAUSE_DECL (c) = TREE_OPERAND (t, 1);
@@ -8739,10 +8755,25 @@ gimplify_omp_for (tree *expr_p, gimple_seq *pre_p)
          t = TREE_VEC_ELT (OMP_FOR_COND (for_stmt), i);
          if (!is_gimple_constant (TREE_OPERAND (t, 1)))
            {
+             tree type = TREE_TYPE (TREE_OPERAND (t, 0));
              TREE_OPERAND (t, 1)
                = get_initialized_tmp_var (TREE_OPERAND (t, 1),
                                           gimple_seq_empty_p (for_pre_body)
                                           ? pre_p : &for_pre_body, NULL);
+             /* Reference to pointer conversion is considered useless,
+                but is significant for firstprivate clause.  Force it
+                here.  */
+             if (TREE_CODE (type) == POINTER_TYPE
+                 && (TREE_CODE (TREE_TYPE (TREE_OPERAND (t, 1)))
+                     == REFERENCE_TYPE))
+               {
+                 tree v = create_tmp_var (TYPE_MAIN_VARIANT (type));
+                 tree m = build2 (INIT_EXPR, TREE_TYPE (v), v,
+                                  TREE_OPERAND (t, 1));
+                 gimplify_and_add (m, gimple_seq_empty_p (for_pre_body)
+                                      ? pre_p : &for_pre_body);
+                 TREE_OPERAND (t, 1) = v;
+               }
              tree c = build_omp_clause (input_location,
                                         OMP_CLAUSE_FIRSTPRIVATE);
              OMP_CLAUSE_DECL (c) = TREE_OPERAND (t, 1);

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index a9bbc5aaa56f5205f98b0fabf92a281deaf4a5ac..45357816aec0faff40b0b7d24c98d8504413c423 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,6 +1,11 @@
 2018-10-12  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-07-17  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/86539
+       * testsuite/libgomp.c++/pr86539.C: New test.
+
        2018-07-26  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/86660

diff --git a/libgomp/testsuite/libgomp.c++/pr86539.C b/libgomp/testsuite/libgomp.c++/pr86539.C
new file mode 100644 (file)
index 0000000..ed0d63e
--- /dev/null
+++ b/libgomp/testsuite/libgomp.c++/pr86539.C
@@ -0,0 +1,28 @@
+// PR middle-end/86539
+
+int a[384];
+
+__attribute__((noinline, noclone)) void
+foo (int &b, int &c)
+{
+  #pragma omp taskloop shared (a) collapse(3)
+  for (int i = 0; i < 1; i++)
+    for (int *p = &b; p < &c; p++)
+      for (int j = 0; j < 1; j++)
+       if (p < &a[128] || p >= &a[256])
+         __builtin_abort ();
+       else
+         p[0]++;
+}
+
+int
+main ()
+{
+  #pragma omp parallel
+  #pragma omp single
+    foo (a[128], a[256]);
+  for (int i = 0; i < 384; i++)
+    if (a[i] != (i >= 128 && i < 256))
+      __builtin_abort ();
+  return 0;
+}