re PR c++/46538 (ICE: SIGSEGV in cp_make_fname_decl (decl.c:3690) on invalid…

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

	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: r166974

gcc/cp/ChangeLog

 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.
+
 	PR c++/46526
 	* semantics.c (cxx_eval_call_expression): Unshare the result.
 

gcc/cp/decl.c

@@ -3687,6 +3687,8 @@ cp_make_fname_decl (location_t loc, 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);

gcc/testsuite/ChangeLog

 2010-11-20  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/46538
+	* g++.dg/other/error34.C: New test.
+
 	PR c++/46526
 	* g++.dg/cpp0x/constexpr-base3.C: New test.
 

gcc/testsuite/g++.dg/other/error34.C

+// PR c++/46538
+// { dg-do compile }
+// { dg-options "" }
+
+S () : str(__PRETTY_FUNCTION__) {}	// { dg-error "forbids declaration" }
+// { dg-error "only constructors" "" { target *-*-* } 5 }