From ea57539c67ed5b3caeb48bbeb997dd9cd055ba39 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Thu, 20 Feb 2014 15:31:01 +0100 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/semantics.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5798bbc85849..00982df2e6eb 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-02-20 Kai Tietz + + PR c++/58835 + * semantics.c (finish_fname): Handle error_mark_node. + 2014-02-19 Jason Merrill PR c++/60046 diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 1d95e3e930b0..d5c35c695c3d 100644 --- 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; } -- 2.47.2