diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7231155bb32..602ab94a8a6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2014-02-20  Kai Tietz  <ktietz@redhat.com>
 
+	PR c++/58873
+	* parser.c (cp_parser_functional_cast): Treat NULL_TREE
+	valued type argument as error_mark_node.
+
 	PR c++/58835
 	* semantics.c (finish_fname): Handle error_mark_node.
 
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 98182138e24..4673f78051a 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -23165,6 +23165,9 @@ cp_parser_functional_cast (cp_parser* parser, tree type)
   tree cast;
   bool nonconst_p;
 
+  if (!type)
+    type = error_mark_node;
+
   if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
     {
       maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);