diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9a2d44775f7..7231155bb32 100644
--- 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 eb1c44ee1f3..6f32496f807 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -2630,7 +2630,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;
 }