diff options
| author | Jan Hubicka <jh@suse.cz> | 2003-07-29 19:42:34 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2003-07-29 17:42:34 +0000 |
| commit | 987bf56f8498866e97f35d866a9d9a9bde777283 (patch) | |
| tree | 0f103e3ff8f0cb48d46bf37b35971a7f157ce279 /gcc | |
| parent | a47c20a77a20936d6d6fd5ebacb7dce43079a66f (diff) | |
| download | gcc-987bf56f8498866e97f35d866a9d9a9bde777283.zip gcc-987bf56f8498866e97f35d866a9d9a9bde777283.tar.gz gcc-987bf56f8498866e97f35d866a9d9a9bde777283.tar.bz2 | |
re PR c++/11131 (Unrelated declaration removes inline flag from function)
PR C++/11131
* tree-inline.c (expand_call_inline): Always call inlinable_function_p
in !unit-at-a-time mode.
From-SVN: r69929
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dc97257..0e339dd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 29 19:24:49 CEST 2003 Jan Hubicka <jh@suse.cz> + + PR C++/11131 + * tree-inline.c (expand_call_inline): Always call inlinable_function_p + in !unit-at-a-time mode. + 2003-07-28 Geoffrey Keating <geoffk@apple.com> * c-decl.c (c_expand_body_1): Use C_DECL_FILE_SCOPE to detect diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 759dc07..bd45b15 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -1164,8 +1164,8 @@ expand_call_inline (tree *tp, int *walk_subtrees, void *data) /* Don't try to inline functions that are not well-suited to inlining. */ - if (!DECL_SAVED_TREE (fn) - || (flag_unit_at_a_time && !cgraph_inline_p (id->current_decl, fn)) + if ((flag_unit_at_a_time + && (!DECL_SAVED_TREE (fn) || !cgraph_inline_p (id->current_decl, fn))) || (!flag_unit_at_a_time && !inlinable_function_p (fn, id, 0))) { if (warn_inline && DECL_INLINE (fn) && !DID_INLINE_FUNC (fn) |