From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 7 Dec 2010 18:58:18 +0000 (+0100)
Subject: backport: re PR c++/46538 (ICE: SIGSEGV in cp_make_fname_decl (decl.c:3690) on invali... 
X-Git-Tag: releases/gcc-4.4.6~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf101c01c744e724ccb1eb0fd67fbcc07e8b5622;p=thirdparty%2Fgcc.git

backport: re PR c++/46538 (ICE: SIGSEGV in cp_make_fname_decl (decl.c:3690) on invalid code when using __PRETTY_FUNCTION__)

	Backport from mainline
	2010-11-20  Jakub Jelinek  <jakub@redhat.com>

	PR c++/46538
	* decl.c (cp_make_fname_decl): Return error_mark_node if
	current_binding_level has already sk_function_parms kind.

	* g++.dg/other/error34.C: New test.

From-SVN: r167559
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1b491594c713..e780d2a25bae 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-07  Jakub Jelinek  <jakub@redhat.com>
+
+	Backport from mainline
+	2010-11-20  Jakub Jelinek  <jakub@redhat.com>
+ 
+	PR c++/46538
+	* decl.c (cp_make_fname_decl): Return error_mark_node if
+	current_binding_level has already sk_function_parms kind.
+
 2010-10-01  Release Manager
 
 	* GCC 4.4.5 released.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 6f208764ea54..5b05d5627c64 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3536,6 +3536,8 @@ cp_make_fname_decl (tree id, int type_dep)
   if (current_function_decl)
     {
       struct cp_binding_level *b = current_binding_level;
+      if (b->kind == sk_function_parms)
+	return error_mark_node;
       while (b->level_chain->kind != sk_function_parms)
 	b = b->level_chain;
       pushdecl_with_scope (decl, b, /*is_friend=*/false);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 80b9b208f2bf..f65d67d21d78 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,7 +1,13 @@
 2010-12-07  Jakub Jelinek  <jakub@redhat.com>
 
 	Backport from mainline
+	2010-11-20  Jakub Jelinek  <jakub@redhat.com>
+ 
+	PR c++/46538
+	* g++.dg/other/error34.C: New test.
+
 	2010-11-18  Jakub Jelinek  <jakub@redhat.com>
+
 	PR middle-end/46534
 	* gcc.c-torture/compile/pr46534.c: New test.
 
diff --git a/gcc/testsuite/g++.dg/other/error34.C b/gcc/testsuite/g++.dg/other/error34.C
new file mode 100644
index 000000000000..10a782d387d5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/error34.C
@@ -0,0 +1,6 @@
+// PR c++/46538
+// { dg-do compile }
+// { dg-options "" }
+
+S () : str(__PRETTY_FUNCTION__) {}	// { dg-error "forbids declaration" }
+// { dg-error "only constructors" "" { target *-*-* } 5 }