re PR libgomp/71941 (ICE with OpenMP tasks and queue)

	PR c++/71941
	* cp-gimplify.c (cp_genericize): For nested cp_genericize calls
	save/restore bc_label array.

	* g++.dg/gomp/pr71941.C: New test.

From-SVN: r238579

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2e8877faef9f287b7dbf599dad446053e4a4e7e7..30a0b44c12140d2c9002ec1364e5a6c27105eb96 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-21  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/71941
+       * cp-gimplify.c (cp_genericize): For nested cp_genericize calls
+       save/restore bc_label array.
+
 2016-07-21  Jason Merrill  <jason@redhat.com>
 
        PR c++/70781

diff --git a/gcc/cp/cp-gimplify.c b/gcc/cp/cp-gimplify.c
index ee28ba5738f98bfb2c42e27e5e6984544ba11633..59953a6ee04376969051acb710456be0667f24f4 100644 (file)
--- a/gcc/cp/cp-gimplify.c
+++ b/gcc/cp/cp-gimplify.c
@@ -1632,6 +1632,13 @@ cp_genericize (tree fndecl)
   if (DECL_CLONED_FUNCTION_P (fndecl))
     return;
 
+  /* Allow cp_genericize calls to be nested.  */
+  tree save_bc_label[2];
+  save_bc_label[bc_break] = bc_label[bc_break];
+  save_bc_label[bc_continue] = bc_label[bc_continue];
+  bc_label[bc_break] = NULL_TREE;
+  bc_label[bc_continue] = NULL_TREE;
+
   /* Expand all the array notations here.  */
   if (flag_cilkplus 
       && contains_array_notation_expr (DECL_SAVED_TREE (fndecl)))
@@ -1651,6 +1658,8 @@ cp_genericize (tree fndecl)
 
   gcc_assert (bc_label[bc_break] == NULL);
   gcc_assert (bc_label[bc_continue] == NULL);
+  bc_label[bc_break] = save_bc_label[bc_break];
+  bc_label[bc_continue] = save_bc_label[bc_continue];
 }
 \f
 /* Build code to apply FN to each member of ARG1 and ARG2.  FN may be

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 004cb5881f5df8227fde4f0a5f483de39a5d3aa3..48f7bafda0f949e5f0e1d9296135d32303fc0add 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-21  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/71941
+       * g++.dg/gomp/pr71941.C: New test.
+
 2016-07-20  David Malcolm  <dmalcolm@redhat.com>
 
        PR c/70339

diff --git a/gcc/testsuite/g++.dg/gomp/pr71941.C b/gcc/testsuite/g++.dg/gomp/pr71941.C
new file mode 100644 (file)
index 0000000..ffa53d0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr71941.C
@@ -0,0 +1,22 @@
+// PR c++/71941
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+struct A { A (); A (A &); ~A (); };
+
+template <int N>
+struct B
+{
+  struct C { A a; C () : a () {} };
+  C c;
+  void foo ();
+};
+
+void
+bar ()
+{
+  B<0> b;
+#pragma omp task
+  for (int i = 0; i < 2; i++)
+    b.foo ();
+}