OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/11131 (Unrelated declaration removes inline flag from function)

Browse Source 
PR c++/11131
	* tree.c (cp_cannot_inline_fn): Check for "inline" before
	instantiation.

From-SVN: r67783
This commit is contained in:
Mark Mitchell 2003-06-11 17:02:13 +00:00 committed by Mark Mitchell
parent c0081c100c
commit a5512a2fe2
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2003-06-11 Mark Mitchell <mark@codesourcery.com>
PR c++/11131
* tree.c (cp_cannot_inline_fn): Check for "inline" before
instantiation.
2003-06-10 Jason Merrill <jason@redhat.com>
PR c++/10968

8
gcc/cp/tree.c
View File

@ -2209,14 +2209,16 @@ cp_cannot_inline_tree_fn (fnp)
if (DECL_TEMPLATE_INFO (fn)
&& TI_PENDING_TEMPLATE_FLAG (DECL_TEMPLATE_INFO (fn)))
{
/* Don't instantiate functions that are not going to be
inlined. */
if (!DECL_INLINE (DECL_TEMPLATE_RESULT
(template_for_substitution (fn))))
return 1;
fn = *fnp = instantiate_decl (fn, /*defer_ok=*/0);
if (TI_PENDING_TEMPLATE_FLAG (DECL_TEMPLATE_INFO (fn)))
return 1;
}
if (!DECL_INLINE (fn))
return 1;
if (flag_really_no_inline
&& lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) == NULL)
return 1;