openmp: Avoid ICEs with declare simd; declare simd inbranch [PR93555]

The testcases ICE because when processing the declare simd inbranch,
we don't create the i == 0 clone as it already exists, which means
clone_info->nargs is not adjusted, but we then rely on it being adjusted
when trying other clones.

2020-02-05  Jakub Jelinek  <jakub@redhat.com>

	PR middle-end/93555
	* omp-simd-clone.c (expand_simd_clones): If simd_clone_mangle or
	simd_clone_create failed when i == 0, adjust clone->nargs by
	clone->inbranch.

	* c-c++-common/gomp/pr93555-1.c: New test.
	* c-c++-common/gomp/pr93555-2.c: New test.
	* gfortran.dg/gomp/pr93555.f90: New test.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0d8e888ec3ac164d78fa7e9d80a8116befd250b7..a4435086f0235a885513d336acd4fd9d13b6c35d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,13 @@
 2020-02-13  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2020-02-05  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/93555
+       * omp-simd-clone.c (expand_simd_clones): If simd_clone_mangle or
+       simd_clone_create failed when i == 0, adjust clone->nargs by
+       clone->inbranch.
+
        2020-01-30  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/93505

diff --git a/gcc/omp-simd-clone.c b/gcc/omp-simd-clone.c
index 845443efc594ab256e00126e20a063d5be7fe8d3..e865828f569d76e4c07c9779e4a2d528ed1e7a65 100644 (file)
--- a/gcc/omp-simd-clone.c
+++ b/gcc/omp-simd-clone.c
@@ -1703,14 +1703,22 @@ expand_simd_clones (struct cgraph_node *node)
             already.  */
          tree id = simd_clone_mangle (node, clone);
          if (id == NULL_TREE)
-           continue;
+           {
+             if (i == 0)
+               clone->nargs += clone->inbranch;
+             continue;
+           }
 
          /* Only when we are sure we want to create the clone actually
             clone the function (or definitions) or create another
             extern FUNCTION_DECL (for prototypes without definitions).  */
          struct cgraph_node *n = simd_clone_create (node);
          if (n == NULL)
-           continue;
+           {
+             if (i == 0)
+               clone->nargs += clone->inbranch;
+             continue;
+           }
 
          n->simdclone = clone;
          clone->origin = node;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 384f34a41ca7f1ff2d4bfad571efbac58538ac08..96390af9e1264dd46befd082f77d72623240613e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,13 @@
 2020-02-13  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2020-02-05  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/93555
+       * c-c++-common/gomp/pr93555-1.c: New test.
+       * c-c++-common/gomp/pr93555-2.c: New test.
+       * gfortran.dg/gomp/pr93555.f90: New test.
+
        2020-01-30  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/93505

diff --git a/gcc/testsuite/c-c++-common/gomp/pr93555-1.c b/gcc/testsuite/c-c++-common/gomp/pr93555-1.c
new file mode 100644 (file)
index 0000000..2eb76a2
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/pr93555-1.c
@@ -0,0 +1,18 @@
+/* PR middle-end/93555 */
+/* { dg-do compile } */
+
+#pragma omp declare simd
+#pragma omp declare simd inbranch
+int
+foo (int x)
+{
+  return x;
+}
+
+#pragma omp declare simd inbranch
+#pragma omp declare simd
+int
+bar (int x)
+{
+  return x;
+}

diff --git a/gcc/testsuite/c-c++-common/gomp/pr93555-2.c b/gcc/testsuite/c-c++-common/gomp/pr93555-2.c
new file mode 100644 (file)
index 0000000..091f5bd
--- /dev/null
+++ b/gcc/testsuite/c-c++-common/gomp/pr93555-2.c
@@ -0,0 +1,16 @@
+/* PR middle-end/93555 */
+/* { dg-do compile } */
+
+#pragma omp declare simd
+#pragma omp declare simd inbranch
+void
+foo (void)
+{
+}
+
+#pragma omp declare simd inbranch
+#pragma omp declare simd
+void
+bar (void)
+{
+}

diff --git a/gcc/testsuite/gfortran.dg/gomp/pr93555.f90 b/gcc/testsuite/gfortran.dg/gomp/pr93555.f90
new file mode 100644 (file)
index 0000000..4a97fee
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/gomp/pr93555.f90
@@ -0,0 +1,11 @@
+! PR middle-end/93555
+! { dg-do compile }
+
+subroutine foo
+  !$omp declare simd(foo)
+  !$omp declare simd(foo) inbranch
+end
+subroutine bar
+  !$omp declare simd(bar) inbranch
+  !$omp declare simd(bar)
+end