diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 15e22e4d99c40cd141d987f4670f288b78f5f080..fcf01dd69848772a100dd0ec15fa1a4bfaa6e80b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,7 @@
 1999-11-02  Mark Mitchell  <mark@codesourcery.com>
 
+	* decl.c (grokfndecl): Remove dead code.
+
 	* dump.c (dequeue_and_dump): Fix thinko for catch-clauses.
 
 1999-11-02  Scott Snyder  <snyder@fnal.gov>
@@ -14648,4 +14650,4 @@ Wed May 14 19:08:28 1997  Mike Stump  <mrs@cygnus.com>
 	(finish_function): Put the base init code for constructors just
 	after the parm cleanup insns.
 	(struct cp_function): Add last_parm_cleanup_insn.
-	(pu
\ No newline at end of file
+	(pu
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 14770e2fa4d55a8663aa1c31bdb38caa8dc23819..40d13967c0fe58c83b31ff24f53da30185dc4671 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8455,9 +8455,6 @@ grokfndecl (ctype, type, declarator, orig_declarator, virtualp, flags, quals,
   if (check < 0)
     return decl;
 
-  if (check && funcdef_flag)
-    DECL_INITIAL (decl) = error_mark_node;
-
   if (flags == NO_SPECIAL && ctype && constructor_name (cname) == declarator)
     {
       tree tmp;