OSDN Git Service

PR c++/58835
authorktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 20 Feb 2014 14:31:01 +0000 (14:31 +0000)
committerktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 20 Feb 2014 14:31:01 +0000 (14:31 +0000)
* semantics.c (finish_fname): Handle error_mark_node.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@207957 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/cp/ChangeLog
gcc/cp/semantics.c

index 5798bbc..00982df 100644 (file)
@@ -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
index 1d95e3e..d5c35c6 100644 (file)
@@ -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;
 }