openmp: One omp_resolve_declare_variant followup

As noticed by Arseny, I got the condition when to call the add removal hook
wrong wrong.  Fixed thusly.

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

	PR middle-end/95315
	* omp-general.c (omp_resolve_declare_variant): Fix up addition of
	declare variant cgraph node removal callback.

	* gcc.dg/gomp/pr95315-2.c: New test.

2 files changed, 47 insertions, 1 deletions

diff --git a/gcc/omp-general.c b/gcc/omp-general.c
index ed27644..5adbd0e 100644
--- a/gcc/omp-general.c
+++ b/gcc/omp-general.c
@@ -1851,7 +1851,7 @@ omp_resolve_declare_variant (tree base)
 	}
 
       static struct cgraph_node_hook_list *node_removal_hook_holder;
-      if (node_removal_hook_holder)
+      if (!node_removal_hook_holder)
 	node_removal_hook_holder
 	  = symtab->add_cgraph_removal_hook (omp_declare_variant_remove_hook,
 					     NULL);
diff --git a/gcc/testsuite/gcc.dg/gomp/pr95315-2.c b/gcc/testsuite/gcc.dg/gomp/pr95315-2.c
new file mode 100644
index 0000000..3a5018a1
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/gomp/pr95315-2.c
@@ -0,0 +1,46 @@
+/* PR middle-end/95315 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fopenmp --param ggc-min-heapsize=0" } */
+
+typedef float __v4sf __attribute__((vector_size (16)));
+typedef int __v4si __attribute__((vector_size (16)));
+typedef float __v8sf __attribute__((vector_size (32)));
+typedef int __v8si __attribute__((vector_size (32)));
+__v4si f1 (__v4sf, __v4sf, float *);
+__v8si f2 (__v8sf, __v8sf, float *);
+__v4si f3 (__v4si, int, __v4si);
+
+#pragma omp declare variant (f1) match (construct={parallel,for,simd(simdlen(4),notinbranch,uniform(z),aligned(z:4 * sizeof (*z)))})
+#pragma omp declare variant (f2) match (construct={for,simd(uniform(z),simdlen(8),notinbranch)})
+int f4 (float x, float y, float *z);
+
+#pragma omp declare variant (f3) match (construct={simd(simdlen(4),inbranch,linear(y:1))})
+int f5 (int x, int y);
+
+static inline __attribute__((always_inline)) int
+ret_false (void)
+{
+  return 0;
+}
+
+void
+test (int *x, float *y, float *z, float *w)
+{
+  #pragma omp parallel
+  #pragma omp for simd aligned (w:4 * sizeof (float))
+  for (int i = 0; i < 1024; i++)
+    if (ret_false ())
+      x[i] = f4 (y[i], z[i], w);
+  #pragma omp parallel for simd aligned (w:4 * sizeof (float)) simdlen(4)
+  for (int i = 1024; i < 2048; i++)
+    if (ret_false ())
+      x[i] = f4 (y[i], z[i], w);
+  #pragma omp simd aligned (w:4 * sizeof (float))
+  for (int i = 2048; i < 4096; i++)
+    if (ret_false ())
+      x[i] = f4 (y[i], z[i], w);
+  #pragma omp simd
+  for (int i = 4096; i < 8192; i++)
+    if (x[i] > 10 && ret_false ())
+      x[i] = f5 (x[i], i);
+}