decl2.c (finish_file): Remove redundant code.

	* decl2.c (finish_file): Remove redundant code.
	* method.c (emit_thunk): Don't let the backend defer generic thunks.

From-SVN: r16353

gcc/cp/ChangeLog

+Thu Nov  6 11:28:14 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* decl2.c (finish_file): Remove redundant code.
+	* method.c (emit_thunk): Don't let the backend defer generic thunks.
+
 Wed Nov  5 23:52:50 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
 	* except.c (call_eh_info): Split out...

gcc/cp/decl2.c

@@ -3260,12 +3260,6 @@ finish_file ()
 		  {
 		    DECL_EXTERNAL (decl) = 0;
 		    reconsider = 1;
-		    /* We can't inline this function after it's been
-                       emitted, so just disable inlining.  We want a
-                       variant of output_inline_function that doesn't
-                       prevent subsequent integration...  */
-		    flag_no_inline = 1;
-		    temporary_allocation ();
 		    output_inline_function (decl);
 		    permanent_allocation (1);
 		  }

gcc/cp/method.c

@@ -1927,6 +1927,13 @@ emit_thunk (thunk_fndecl)
     c_expand_return (t);
 
     finish_function (lineno, 0, 0);
+
+    /* Don't let the backend defer this function.  */
+    if (DECL_DEFER_OUTPUT (thunk_fndecl))
+      {
+	output_inline_function (thunk_fndecl);
+	permanent_allocation (1);
+      }
 #endif /* ASM_OUTPUT_MI_THUNK */
   }