diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1997-11-07 19:58:26 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1997-11-07 14:58:26 -0500 |
| commit | bd871063c593eb5fc415b0f372197b3660e0c2f7 (patch) | |
| tree | 5c3262c81e5ba7e22b330ea18a744e8858a12da1 | |
| parent | 9799193348660e6817ce659df88094692e803599 (diff) | |
| download | gcc-bd871063c593eb5fc415b0f372197b3660e0c2f7.zip gcc-bd871063c593eb5fc415b0f372197b3660e0c2f7.tar.gz gcc-bd871063c593eb5fc415b0f372197b3660e0c2f7.tar.bz2 | |
* decl2.c (finish_file): Put back some code.
From-SVN: r16361
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8ae7e39..a933801 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +Fri Nov 7 11:57:28 1997 Jason Merrill <jason@yorick.cygnus.com> + + * decl2.c (finish_file): Put back some code. + Thu Nov 6 11:28:14 1997 Jason Merrill <jason@yorick.cygnus.com> * decl2.c (finish_file): Remove redundant code. diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 2ca75db..b51e660 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -3260,6 +3260,11 @@ finish_file () { DECL_EXTERNAL (decl) = 0; reconsider = 1; + /* We can't inline this function after it's been + emitted. We want a variant of + output_inline_function that doesn't prevent + subsequent integration... */ + DECL_INLINE (decl) = 0; output_inline_function (decl); permanent_allocation (1); } |