* decl.c (start_function): Robustify.

From-SVN: r36527

gcc/cp/ChangeLog

+2000-09-18  Mark Mitchell  <mark@codesourcery.com>
+
+	* decl.c (start_function): Robustify.
+
 2000-09-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* cp-tree.h (check_function_format): Accept a `status' parameter.

gcc/cp/decl.c

@@ -13711,9 +13711,14 @@ start_function (declspecs, declarator, attrs, flags)
   current_function_decl = decl1;
   cfun->decl = decl1;
 
-  my_friendly_assert ((DECL_PENDING_INLINE_P (decl1) 
-		       || !DECL_SAVED_FUNCTION_DATA (decl1)),
-		      20000911);
+  /* If we are (erroneously) defining a function that we have already
+     defined before, wipe out what we knew before.  */
+  if (!DECL_PENDING_INLINE_P (decl1) 
+      && DECL_SAVED_FUNCTION_DATA (decl1))
+    {
+      free (DECL_SAVED_FUNCTION_DATA (decl1));
+      DECL_SAVED_FUNCTION_DATA (decl1) = NULL;
+    }
 
   if (ctype && !doing_friend && !DECL_STATIC_FUNCTION_P (decl1))
     {

gcc/testsuite/g++.old-deja/g++.other/crash23.C

+// Build don't link:
+// Origin: Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
+
+class T;
+inline void operator<(T&, T&) { }
+inline void operator<(T&, T&) { }
+