summaryrefslogtreecommitdiff
path: root/gcc/ipa-inline.c
diff options
context:
space:
mode:
authorbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-03-14 07:03:09 +0000
committerbstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4>2011-03-14 07:03:09 +0000
commitd329a134cd2455f54f873318532f14938116b8b6 (patch)
tree2e790b36b33b55ae6f7b6bdff6fbf559fce5df4f /gcc/ipa-inline.c
parent9f9551c1ebf9d9421d8496c92d0f4a8c7b7571b5 (diff)
downloadgcc-d329a134cd2455f54f873318532f14938116b8b6.tar.gz
2011-03-14 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 170931 using svnmerge git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@170932 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ipa-inline.c')
-rw-r--r--gcc/ipa-inline.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index e8676c8394b..7ae5f96dc7c 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -1,5 +1,5 @@
/* Inlining decision heuristics.
- Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010
+ Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
Contributed by Jan Hubicka
@@ -1498,6 +1498,7 @@ cgraph_decide_inlining (void)
&& node->callers->caller != node
&& node->callers->caller->global.inlined_to != node
&& !node->callers->call_stmt_cannot_inline_p
+ && tree_can_inline_p (node->callers)
&& !DECL_EXTERNAL (node->decl))
{
cgraph_inline_failed_t reason;