aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@yorick.cygnus.com>1997-11-07 03:37:39 +0000
committerJason Merrill <jason@gcc.gnu.org>1997-11-06 22:37:39 -0500
commit4d6efa25acb70ad2de63e3dd567786ecd7739c67 (patch)
tree70eecbf6db02538bf39b7016c511abd7d190b06e /gcc
parent55e0182bdb5f11c5277a05aca2fc33775e7faee4 (diff)
downloadgcc-4d6efa25acb70ad2de63e3dd567786ecd7739c67.zip
gcc-4d6efa25acb70ad2de63e3dd567786ecd7739c67.tar.gz
gcc-4d6efa25acb70ad2de63e3dd567786ecd7739c67.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/decl2.c6
-rw-r--r--gcc/cp/method.c7
3 files changed, 12 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 094b8d6..8ae7e39 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 c9c7f7c..2ca75db 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 3b7dbc8..0e407fe 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 */
}