diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2015-04-12 07:44:52 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2015-04-12 05:44:52 +0000 |
| commit | db66bf68a1cd1d417000032cc255dfe177ce50fc (patch) | |
| tree | 8ac0aecfa0363647ac374049bbb636b19fed1996 /gcc/ipa-inline-transform.c | |
| parent | c153ad0318b0d4845a3a1598cae7e2617f9fe0e5 (diff) | |
| download | gcc-db66bf68a1cd1d417000032cc255dfe177ce50fc.zip gcc-db66bf68a1cd1d417000032cc255dfe177ce50fc.tar.gz gcc-db66bf68a1cd1d417000032cc255dfe177ce50fc.tar.bz2 | |
re PR middle-end/65743 (LTO+FDO build of Firefox crashes at startup)
PR ipa/65743
* ipa-inline-transform.c (speculation_removed): Remove static var.
(check_speculations): New function.
(clone_inlined_nodes): Do not check spculations.
(inline_call): Call check_speculations.
* ipa-prop.c (ipa_make_edge_direct_to_target): Do not
consider non-invariants.
From-SVN: r222017
Diffstat (limited to 'gcc/ipa-inline-transform.c')
| -rw-r--r-- | gcc/ipa-inline-transform.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c index 99ed512..5a628f3 100644 --- a/gcc/ipa-inline-transform.c +++ b/gcc/ipa-inline-transform.c @@ -64,7 +64,6 @@ along with GCC; see the file COPYING3. If not see int ncalls_inlined; int nfunctions_inlined; -bool speculation_removed; /* Scale frequency of NODE edges by FREQ_SCALE. */ @@ -256,12 +255,29 @@ clone_inlined_nodes (struct cgraph_edge *e, bool duplicate, next = e->next_callee; if (!e->inline_failed) clone_inlined_nodes (e, duplicate, update_original, overall_size, freq_scale); + } +} + +/* Check all speculations in N and resolve them if they seems useless. */ + +static bool +check_speculations (cgraph_node *n) +{ + bool speculation_removed = false; + cgraph_edge *next; + + for (cgraph_edge *e = n->callees; e; e = next) + { + next = e->next_callee; if (e->speculative && !speculation_useful_p (e, true)) { e->resolve_speculation (NULL); speculation_removed = true; } + else if (!e->inline_failed) + speculation_removed |= check_speculations (e->callee); } + return speculation_removed; } /* Mark all call graph edges coming out of NODE and all nodes that have been @@ -310,7 +326,6 @@ inline_call (struct cgraph_edge *e, bool update_original, bool predicated = inline_edge_summary (e)->predicate != NULL; #endif - speculation_removed = false; /* Don't inline inlined edges. */ gcc_assert (e->inline_failed); /* Don't even think of inlining inline clone. */ @@ -360,6 +375,7 @@ inline_call (struct cgraph_edge *e, bool update_original, mark_all_inlined_calls_cdtor (e->callee); if (opt_for_fn (e->caller->decl, optimize)) new_edges_found = ipa_propagate_indirect_call_infos (curr, new_edges); + check_speculations (e->callee); if (update_overall_summary) inline_update_overall_summary (to); new_size = inline_summaries->get (to)->size; |