diff options
| -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 9ad06f8..b119fa7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-04-19 Eric Botcazou <ebotcazou@adacore.com> + + * tree-inline.c (expand_call_inline): Do not issue a -Winline warning + if DECL_NO_INLINE_WARNING_P is set on the function. + 2011-04-19 Bernd Schmidt <bernds@codesourcery.com> PR fortran/47976 @@ -41,7 +46,6 @@ * config/vms/vms-ar.c: New file. * config/vms/t-vmsnative: New file. ->>>>>>> .r172704 2011-04-18 Xinliang David Li <davidxl@google.com> * final.c (dump_basic_block_info): Use ASM_COMMENT_START. diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index ea4baac..c255f52 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -3744,7 +3744,9 @@ expand_call_inline (basic_block bb, gimple stmt, copy_body_data *id) _(cgraph_inline_failed_string (reason))); sorry ("called from here"); } - else if (warn_inline && DECL_DECLARED_INLINE_P (fn) + else if (warn_inline + && DECL_DECLARED_INLINE_P (fn) + && !DECL_NO_INLINE_WARNING_P (fn) && !DECL_IN_SYSTEM_HEADER (fn) && reason != CIF_UNSPECIFIED && !lookup_attribute ("noinline", DECL_ATTRIBUTES (fn)) |