From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 26 Nov 2013 20:39:56 +0000 (+0100)
Subject: re PR c++/58874 ([c++11] ICE with OpenMP reduction declaration and -std=c++11)
X-Git-Tag: releases/gcc-4.9.0~2439
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5999f07fba49a339bed42319b2a304f521872931;p=thirdparty%2Fgcc.git

re PR c++/58874 ([c++11] ICE with OpenMP reduction declaration and -std=c++11)

	PR c++/58874
	* parser.c (cp_parser_late_parsing_for_member): For OpenMP UDRs
	pass 2 instead of 0 to finish_function.

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

From-SVN: r205412
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 604f26dc14b6..802e4fa77328 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/58874
+	* parser.c (cp_parser_late_parsing_for_member): For OpenMP UDRs
+	pass 2 instead of 0 to finish_function.
+
 2013-11-26  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/58700
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index d7092cc6759b..7d3eaeebf6a9 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -23275,7 +23275,7 @@ cp_parser_late_parsing_for_member (cp_parser* parser, tree member_function)
 	{
 	  parser->lexer->in_pragma = true;
 	  cp_parser_omp_declare_reduction_exprs (member_function, parser);
-	  finish_function (0);
+	  finish_function (/*inline*/2);
 	  cp_check_omp_declare_reduction (member_function);
 	}
       else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a23c39725168..a00cd97d63c6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2013-11-26  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/58874
+	* g++.dg/gomp/pr58874.C: New test.
+
 	PR middle-end/59150
 	* g++.dg/gomp/pr59150.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/gomp/pr58874.C b/gcc/testsuite/g++.dg/gomp/pr58874.C
new file mode 100644
index 000000000000..be3f53e44679
--- /dev/null
+++ b/gcc/testsuite/g++.dg/gomp/pr58874.C
@@ -0,0 +1,14 @@
+// PR c++/58874
+// { dg-do compile }
+// { dg-options "-fopenmp" }
+
+struct A
+{
+  template<int> struct B
+  {
+    #pragma omp declare reduction (x : int : omp_out |= omp_in)
+  };
+};
+
+#pragma omp declare reduction (y : long : omp_out |= omp_in) \
+	initializer (omp_priv = 0)