aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorChristian Bruel <chrbr@gcc.gnu.org>2015-04-17 08:50:08 +0200
committerChristian Bruel <chrbr@gcc.gnu.org>2015-04-17 08:50:08 +0200
commit86f46e3972ce44064990c1fcd97fa97a9492ee44 (patch)
tree59094dbc12ae5bfb6f80e2ddd6aa46307ffea81f /gcc
parent37dc4579fbdeeb16831b3bb1a0d9d26c31163381 (diff)
downloadgcc-86f46e3972ce44064990c1fcd97fa97a9492ee44.zip
gcc-86f46e3972ce44064990c1fcd97fa97a9492ee44.tar.gz
gcc-86f46e3972ce44064990c1fcd97fa97a9492ee44.tar.bz2
ipa-inline.c (can_inline_edge_p): Allow inlining of functions with same attributes.
* ipa-inline.c (can_inline_edge_p): Allow inlining of functions with same attributes. From-SVN: r222165
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/ipa-inline.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 008bd47..eba141d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,9 @@
-2015-04-16 Zhouyi Zhou <yizhouzhou@ict.ac.cn>
+2015-04-17 Christian Bruel <christian.bruel@st.com>
+
+ * ipa-inline.c (can_inline_edge_p): Allow inlining of functions with
+ same attributes.
+
+2015-04-16 Zhouyi Zhou <yizhouzhou@ict.ac.cn>
* ira-color.c (setup_left_conflict_sizes_p): Do not process
node itself when computing left conflict subnode size.
diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c
index 4533ea4..565c5e3 100644
--- a/gcc/ipa-inline.c
+++ b/gcc/ipa-inline.c
@@ -515,7 +515,7 @@ can_inline_edge_p (struct cgraph_edge *e, bool report,
else if (opt_for_fn (callee->decl, optimize_size)
< opt_for_fn (caller->decl, optimize_size)
|| (opt_for_fn (callee->decl, optimize)
- >= opt_for_fn (caller->decl, optimize)))
+ > opt_for_fn (caller->decl, optimize)))
{
if (estimate_edge_time (e)
>= 20 + inline_edge_summary (e)->call_stmt_time)