[committed] openmp: Fix ICE when splitting invalid depend(source)/depend(sink:vec) [PR106836]

Message ID Yxb24eMBpVYmGwTL@tucnak
State New, archived
Headers
Series [committed] openmp: Fix ICE when splitting invalid depend(source)/depend(sink:vec) [PR106836] |

Commit Message

Jakub Jelinek Sept. 6, 2022, 7:29 a.m. UTC
  Hi!

As we now create OMP_CLAUSE_DOACROSS rather than OMP_CLAUSE_DEPEND when
depend is used with source/sink modifiers, c_omp_split_clauses can see
OMP_CLAUSE_DOACROSS clause too before we diagnose it as erroneous.

The following patch treats it like OMP_CLAUSE_DEPEND during
the splitting but adds an assertion.

Bootstrapped/regtested on x86_64-linux and i686-linux, committed to trunk.

2022-09-06  Jakub Jelinek  <jakub@redhat.com>

	PR c/106836
	* c-omp.cc (c_omp_split_clauses): Handle OMP_CLAUSE_DOACROSS.

	* c-c++-common/gomp/pr106836.c: New test.


	Jakub
  

Patch

--- gcc/c-family/c-omp.cc.jj	2022-09-03 09:41:34.846006111 +0200
+++ gcc/c-family/c-omp.cc	2022-09-05 15:00:00.386360743 +0200
@@ -1877,6 +1877,12 @@  c_omp_split_clauses (location_t loc, enu
 	case OMP_CLAUSE_DEPEND:
 	  s = C_OMP_CLAUSE_SPLIT_TARGET;
 	  break;
+	case OMP_CLAUSE_DOACROSS:
+	  /* This can happen with invalid depend(source) or
+	     depend(sink:vec) on target combined with other constructs.  */
+	  gcc_assert (OMP_CLAUSE_DOACROSS_DEPEND (clauses));
+	  s = C_OMP_CLAUSE_SPLIT_TARGET;
+	  break;
 	case OMP_CLAUSE_NUM_TEAMS:
 	  s = C_OMP_CLAUSE_SPLIT_TEAMS;
 	  break;
--- gcc/testsuite/c-c++-common/gomp/pr106836.c.jj	2022-09-05 15:09:28.715774353 +0200
+++ gcc/testsuite/c-c++-common/gomp/pr106836.c	2022-09-05 15:08:49.273300853 +0200
@@ -0,0 +1,9 @@ 
+/* PR c/106836 */
+
+void
+foo (void)
+{
+#pragma omp target parallel depend (source)	/* { dg-error "'depend\\\(source\\\)' is only allowed in 'omp ordered'" } */
+  ;
+#pragma omp taskwait
+}