backport: re PR middle-end/85488 (segmentation fault when compiling code using the...

	Backported from mainline
	2018-10-19  Jakub Jelinek  <jakub@redhat.com>

	PR middle-end/85488
	PR middle-end/87649
	* omp-low.c (check_omp_nesting_restrictions): Diagnose ordered without
	depend closely nested inside of loop with ordered clause with
	a parameter.

	* c-c++-common/gomp/doacross-2.c: New test.
	* c-c++-common/gomp/sink-3.c: Expect another error during error
	recovery.

From-SVN: r275065

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b6b70711792896859152f099ac302def6f80696b..6703f2a0e75c3d334a929ceace8720f61ac5a0c7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2019-08-30  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-10-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/85488
+       PR middle-end/87649
+       * omp-low.c (check_omp_nesting_restrictions): Diagnose ordered without
+       depend closely nested inside of loop with ordered clause with
+       a parameter.
+
 2019-08-25  Uroš Bizjak  <ubizjak@gmail.com>
 
        PR target/91533

diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 2fda448057081f06bb35d963680abeff55ee4851..775951e12a8196d4999c30816198a055ee40f900 100644 (file)
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -2888,14 +2888,25 @@ check_omp_nesting_restrictions (gimple *stmt, omp_context *ctx)
          case GIMPLE_OMP_FOR:
            if (gimple_omp_for_kind (ctx->stmt) == GF_OMP_FOR_KIND_TASKLOOP)
              goto ordered_in_taskloop;
-           if (omp_find_clause (gimple_omp_for_clauses (ctx->stmt),
-                                OMP_CLAUSE_ORDERED) == NULL)
+           tree o;
+           o = omp_find_clause (gimple_omp_for_clauses (ctx->stmt),
+                                OMP_CLAUSE_ORDERED);
+           if (o == NULL)
              {
                error_at (gimple_location (stmt),
                          "%<ordered%> region must be closely nested inside "
                          "a loop region with an %<ordered%> clause");
                return false;
              }
+           if (OMP_CLAUSE_ORDERED_EXPR (o) != NULL_TREE
+               && omp_find_clause (c, OMP_CLAUSE_DEPEND) == NULL_TREE)
+             {
+               error_at (gimple_location (stmt),
+                         "%<ordered%> region without %<depend%> clause may "
+                         "not be closely nested inside a loop region with "
+                         "an %<ordered%> clause with a parameter");
+               return false;
+             }
            return true;
          case GIMPLE_OMP_TARGET:
            if (gimple_omp_target_kind (ctx->stmt)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fc96356c1e73cb602cc5e74910e1292cc33f5e80..bdc93394d0204dcd93c8cc12980bf6a8b1cba7d5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2019-08-30  Jakub Jelinek  <jakub@redhat.com>
+
+       Backported from mainline
+       2018-10-19  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/85488
+       PR middle-end/87649
+       * c-c++-common/gomp/doacross-2.c: New test.
+       * c-c++-common/gomp/sink-3.c: Expect another error during error
+       recovery.
+
 2019-08-20  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gcc.c-torture/execute/20190820-1.c: New test.

diff --git a/gcc/testsuite/c-c++-common/gomp/doacross-2.c b/gcc/testsuite/c-c++-common/gomp/doacross-2.c
new file mode 100644 (file)
index 0000000..cc45487
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/doacross-2.c
@@ -0,0 +1,49 @@
+/* PR middle-end/87649 */
+
+void
+foo (void)
+{
+  int i;
+  #pragma omp for ordered(1)
+  for (i = 0; i < 64; i++)
+    {
+      #pragma omp ordered                      /* { dg-error "'ordered' region without 'depend' clause may not be closely nested inside a loop region with an 'ordered' clause with a parameter" } */
+      ;
+    }
+  #pragma omp for ordered(1)
+  for (i = 0; i < 64; i++)
+    {
+      #pragma omp ordered threads              /* { dg-error "'ordered' region without 'depend' clause may not be closely nested inside a loop region with an 'ordered' clause with a parameter" } */
+      ;
+    }
+}
+
+void
+bar (void)
+{
+  int i;
+  #pragma omp for ordered
+  for (i = 0; i < 64; i++)
+    {
+      #pragma omp ordered depend(source)       /* { dg-error "'ordered' construct with 'depend' clause must be closely nested inside a loop with 'ordered' clause with a parameter" } */
+      #pragma omp ordered depend(sink: i - 1)  /* { dg-error "'ordered' construct with 'depend' clause must be closely nested inside a loop with 'ordered' clause with a parameter" } */
+    }
+  #pragma omp for
+  for (i = 0; i < 64; i++)
+    {
+      #pragma omp ordered depend(source)       /* { dg-error "'ordered' construct with 'depend' clause must be closely nested inside a loop with 'ordered' clause with a parameter" } */
+      #pragma omp ordered depend(sink: i - 1)  /* { dg-error "'ordered' construct with 'depend' clause must be closely nested inside a loop with 'ordered' clause with a parameter" } */
+    }
+  #pragma omp for
+  for (i = 0; i < 64; i++)
+    {
+      #pragma omp ordered                      /* { dg-error "'ordered' region must be closely nested inside a loop region with an 'ordered' clause" } */
+      ;
+    }
+  #pragma omp for
+  for (i = 0; i < 64; i++)
+    {
+      #pragma omp ordered threads              /* { dg-error "'ordered' region must be closely nested inside a loop region with an 'ordered' clause" } */
+      ;
+    }
+}

diff --git a/gcc/testsuite/c-c++-common/gomp/sink-3.c b/gcc/testsuite/c-c++-common/gomp/sink-3.c
index 7cb16ed0f76005024f8ba070bf51ff97568c32b9..588aea215c947cdde03c6786ba3b36b44d7842da 100644 (file)
--- a/gcc/testsuite/c-c++-common/gomp/sink-3.c
+++ b/gcc/testsuite/c-c++-common/gomp/sink-3.c
@@ -14,7 +14,7 @@ foo ()
   for (i=0; i < 100; ++i)
     {
 #pragma omp ordered depend(sink:poo-1,paa+1) /* { dg-error "poo.*declared.*paa.*declared" } */
-    bar(&i);
+    bar(&i);                                /* { dg-error "may not be closely nested" "" { target *-*-* } .-1 } */
 #pragma omp ordered depend(source)
     }
 }