(expand_call): Don't require both -W and -Winline to say that call can't be inlined.

(expand_call): Don't require both -W and -Winline to say that call can't be
inlined.
Warn if inlining is tried but fails.

From-SVN: r6905

diff --git a/gcc/calls.c b/gcc/calls.c
index c7a85bed1f804789ed8bdbfbfdca10ae7e743aa4..9cf1d9296adefa21cc1484ac0aee0f82ca10f01c 100644 (file)
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -581,9 +581,8 @@ expand_call (exp, target, ignore)
 
                 Use abstraction instead of setting TREE_ADDRESSABLE
                 directly.  */
-             if (DECL_INLINE (fndecl) && extra_warnings && warn_inline
-                 && !flag_no_inline)
-               warning_with_decl (fndecl, "can't inline call to `%s' which was declared inline");
+             if (DECL_INLINE (fndecl) && warn_inline && !flag_no_inline)
+               warning_with_decl (fndecl, "can't inline call to `%s'");
              mark_addressable (fndecl);
            }
 
@@ -746,7 +745,11 @@ expand_call (exp, target, ignore)
        }
 
       /* If inlining failed, mark FNDECL as needing to be compiled
-        separately after all.  */
+        separately after all.  If function was declared inline,
+        give a warning.  */
+      if (DECL_INLINE (fndecl) && warn_inline && !flag_no_inline
+         && ! TREE_ADDRESSABLE (fndecl))
+       warning_with_decl (fndecl, "can't inline call to `%s'");
       mark_addressable (fndecl);
     }