diff options
| author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-17 14:57:14 +0000 |
|---|---|---|
| committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-04-17 14:57:14 +0000 |
| commit | 30f589a58a21df8cf6b717a9f9e9f6f6f993b42b (patch) | |
| tree | dd5c8d947f784754912daf7a0e53eb04ab7a91a9 | |
| parent | 4f7f77aa3639a3f3021c893253e743265c3da383 (diff) | |
| download | gcc-30f589a58a21df8cf6b717a9f9e9f6f6f993b42b.tar.gz | |
PR lto/48538
* lto-cgraph.c (merge_profile_summaries): Check that lto_file_data
is non-null before accessing it.
(input_cgraph): Remove trailing spaces.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172611 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/lto-cgraph.c | 5 |
2 files changed, 13 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 73f304d0788..4af4017c896 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-04-17 Eric Botcazou <ebotcazou@adacore.com> + + PR lto/48538 + * lto-cgraph.c (merge_profile_summaries): Check that lto_file_data + is non-null before accessing it. + (input_cgraph): Remove trailing spaces. + 2011-04-17 Revital Eres <revital.eres@linaro.org> * params.def (sms-min-sc): New param flag. @@ -69,9 +76,9 @@ (estimate_growth): Fix handlig of non-trivial self recursion. (inline_read_summary): Do not read info->disregard_inline_limits. (inline_write_summary): Do not write info->disregard_inline_limits. - * tree-inline.c (inline_forbidden_into_p, tree_can_inline_p): Remove and - move all checks into can_inline_edge_p predicate; re-enable code comparing - optimization levels. + * tree-inline.c (inline_forbidden_into_p, tree_can_inline_p): Remove + and move all checks into can_inline_edge_p predicate; re-enable code + comparing optimization levels. (expand_call_inline): Do not test inline_forbidden_into_p. * Makefile.in (ipa-inline.o): Update arguments. diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c index 861a37b55a1..7f0910b0e87 100644 --- a/gcc/lto-cgraph.c +++ b/gcc/lto-cgraph.c @@ -1463,7 +1463,8 @@ merge_profile_summaries (struct lto_file_decl_data **file_data_vec) During LTRANS we already have values of count_materialization_scale computed, so just update them. */ for (node = cgraph_nodes; node; node = node->next) - if (node->local.lto_file_data->profile_info.runs) + if (node->local.lto_file_data + && node->local.lto_file_data->profile_info.runs) { int scale; @@ -1535,8 +1536,8 @@ input_cgraph (void) VEC_free (cgraph_node_ptr, heap, nodes); VEC_free (varpool_node_ptr, heap, varpool); } + merge_profile_summaries (file_data_vec); - /* Clear out the aux field that was used to store enough state to tell which nodes should be overwritten. */ |