From: Jason Merrill <jason@yorick.cygnus.com>
Date: Fri, 7 Nov 1997 03:37:39 +0000 (+0000)
Subject: decl2.c (finish_file): Remove redundant code.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4d6efa25acb70ad2de63e3dd567786ecd7739c67;p=gcc.git

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
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 094b8d6f3e0..8ae7e39e139 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+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...
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index c9c7f7c0fb2..2ca75dbbd9b 100644
--- a/gcc/cp/decl2.c
+++ b/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);
 		  }
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 3b7dbc833a3..0e407fe1ab8 100644
--- a/gcc/cp/method.c
+++ b/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 */
   }