re PR c++/58835 (ICE with __PRETTY_FUNCTION__ in broken function)

	PR c++/58835
	* semantics.c (finish_fname): Handle error_mark_node.

From-SVN: r207957

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5798bbc858493302881fa7e05f490a1b7e0ba20f..00982df2e6eb99a3efae90395b3b6b41c8b66e2c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-20  Kai Tietz  <ktietz@redhat.com>
+
+       PR c++/58835
+       * semantics.c (finish_fname): Handle error_mark_node.
+
 2014-02-19  Jason Merrill  <jason@redhat.com>
 
        PR c++/60046

diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 1d95e3e930b03ee3713f73a39d3b4ae6a24b2363..d5c35c695c3d2da81e89d3332f2ca5e64e31a7a1 100644 (file)
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2430,7 +2430,8 @@ finish_fname (tree id)
   tree decl;
 
   decl = fname_decl (input_location, C_RID_CODE (id), id);
-  if (processing_template_decl && current_function_decl)
+  if (processing_template_decl && current_function_decl
+      && decl != error_mark_node)
     decl = DECL_NAME (decl);
   return decl;
 }