From 987bf56f8498866e97f35d866a9d9a9bde777283 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Tue, 29 Jul 2003 19:42:34 +0200 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/tree-inline.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dc9725702e4..0e339ddffd4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 29 19:24:49 CEST 2003 Jan Hubicka + + 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 * 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 759dc074731..bd45b15fe2b 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) -- 2.30.2