From: H.J. Lu <hongjiu.lu@intel.com>
Date: Thu, 26 Feb 2009 19:59:38 +0000 (+0000)
Subject: re PR c++/37789 (ICE with __FUNCTION__)
X-Git-Tag: releases/gcc-4.4.0~424
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aad5badd41812674fdd02fce3647831d85137825;p=thirdparty%2Fgcc.git

re PR c++/37789 (ICE with __FUNCTION__)

gcc/cp

2009-02-26  H.J. Lu  <hongjiu.lu@intel.com>

	PR c++/37789
	* parser.c (cp_parser_mem_initializer): Return error_mark_node
	if cp_parser_mem_initializer_id returns error_mark_node.

gcc/testsuite/

2009-02-26  H.J. Lu  <hongjiu.lu@intel.com>

	PR c++/37789
	* other/pr37789.C: New.

From-SVN: r144451
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9bf4224256fe..9d1ab5a6211c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR c++/37789
+	* parser.c (cp_parser_mem_initializer): Return error_mark_node
+	if cp_parser_mem_initializer_id returns error_mark_node.
+
 2009-02-24  Richard Guenther  <rguenther@suse.de>
 
 	PR c++/39242
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index ead7d3a3907d..80a767ebe2d4 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -9200,7 +9200,11 @@ cp_parser_mem_initializer (cp_parser* parser)
       mem_initializer_id = NULL_TREE;
     }
   else
-    mem_initializer_id = cp_parser_mem_initializer_id (parser);
+    {
+      mem_initializer_id = cp_parser_mem_initializer_id (parser);
+      if (mem_initializer_id == error_mark_node)
+	return mem_initializer_id;
+    }
   member = expand_member_init (mem_initializer_id);
   if (member && !DECL_P (member))
     in_base_initializer = 1;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4b9936e95647..d86d2d56fd3f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR c++/37789
+	* other/pr37789.C: New.
+
 2009-02-26  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/39295
diff --git a/gcc/testsuite/g++.dg/other/pr37789.C b/gcc/testsuite/g++.dg/other/pr37789.C
new file mode 100644
index 000000000000..728c2fcc6f24
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/pr37789.C
@@ -0,0 +1,7 @@
+// PR c++/37789
+// { dg-do compile }
+
+void foo():
+{		// { dg-error "initializers|identifier" }
+  __FUNCTION__;
+}