From 837bac8cb6e58e3665c736c338dfaf64330c1971 Mon Sep 17 00:00:00 2001 From: Ilya Verbin Date: Wed, 14 Jan 2015 15:15:21 +0000 Subject: [PATCH] cgraphunit.c (ipa_passes): Remove argument from ipa_write_summaries. gcc/ * cgraphunit.c (ipa_passes): Remove argument from ipa_write_summaries. * lto-cgraph.c (select_what_to_stream): Remove argument, use lto_stream_offload_p instead. * lto-streamer.h (select_what_to_stream): Remove argument. * passes.c (ipa_write_summaries): Likewise. * tree-pass.h (ipa_write_summaries): Likewise. gcc/lto/ * lto-partition.c (lto_promote_cross_file_statics): Remove argument from select_what_to_stream. From-SVN: r219605 --- gcc/ChangeLog | 9 +++++++++ gcc/cgraphunit.c | 4 ++-- gcc/lto-cgraph.c | 4 ++-- gcc/lto-streamer.h | 2 +- gcc/lto/ChangeLog | 5 +++++ gcc/lto/lto-partition.c | 3 ++- gcc/passes.c | 4 ++-- gcc/tree-pass.h | 2 +- 8 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 91223cb9ef4..2fe870b2256 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2015-01-14 Ilya Verbin + + * cgraphunit.c (ipa_passes): Remove argument from ipa_write_summaries. + * lto-cgraph.c (select_what_to_stream): Remove argument, use + lto_stream_offload_p instead. + * lto-streamer.h (select_what_to_stream): Remove argument. + * passes.c (ipa_write_summaries): Likewise. + * tree-pass.h (ipa_write_summaries): Likewise. + 2015-01-14 Richard Biener PR tree-optimization/59354 diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 149f4474e3d..1ef1b6c648d 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -2115,14 +2115,14 @@ ipa_passes (void) { section_name_prefix = OFFLOAD_SECTION_NAME_PREFIX; lto_stream_offload_p = true; - ipa_write_summaries (true); + ipa_write_summaries (); lto_stream_offload_p = false; } if (flag_lto) { section_name_prefix = LTO_SECTION_NAME_PREFIX; lto_stream_offload_p = false; - ipa_write_summaries (false); + ipa_write_summaries (); } } diff --git a/gcc/lto-cgraph.c b/gcc/lto-cgraph.c index 6c6501afc4a..91be53036f3 100644 --- a/gcc/lto-cgraph.c +++ b/gcc/lto-cgraph.c @@ -842,11 +842,11 @@ create_references (lto_symtab_encoder_t encoder, symtab_node *node) /* Select what needs to be streamed out. In regular lto mode stream everything. In offload lto mode stream only nodes marked as offloadable. */ void -select_what_to_stream (bool offload_lto_mode) +select_what_to_stream (void) { struct symtab_node *snode; FOR_EACH_SYMBOL (snode) - snode->need_lto_streaming = !offload_lto_mode || snode->offloadable; + snode->need_lto_streaming = !lto_stream_offload_p || snode->offloadable; } /* Find all symbols we want to stream into given partition and insert them diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h index 853630f1931..2d9f30c79c3 100644 --- a/gcc/lto-streamer.h +++ b/gcc/lto-streamer.h @@ -837,7 +837,7 @@ bool referenced_from_this_partition_p (symtab_node *, bool reachable_from_this_partition_p (struct cgraph_node *, lto_symtab_encoder_t); lto_symtab_encoder_t compute_ltrans_boundary (lto_symtab_encoder_t encoder); -void select_what_to_stream (bool); +void select_what_to_stream (void); /* In options-save.c. */ void cl_target_option_stream_out (struct output_block *, struct bitpack_d *, diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 7bcb7dd1c5d..4eafaccc822 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,8 @@ +2015-01-14 Ilya Verbin + + * lto-partition.c (lto_promote_cross_file_statics): Remove argument + from select_what_to_stream. + 2015-01-09 Bernd Schmidt Jakub Jelinek diff --git a/gcc/lto/lto-partition.c b/gcc/lto/lto-partition.c index 38809d28549..c1179cb2eff 100644 --- a/gcc/lto/lto-partition.c +++ b/gcc/lto/lto-partition.c @@ -973,7 +973,8 @@ lto_promote_cross_file_statics (void) gcc_assert (flag_wpa); - select_what_to_stream (false); + lto_stream_offload_p = false; + select_what_to_stream (); /* First compute boundaries. */ n_sets = ltrans_partitions.length (); diff --git a/gcc/passes.c b/gcc/passes.c index 52dc067900e..e78a32546c2 100644 --- a/gcc/passes.c +++ b/gcc/passes.c @@ -2464,7 +2464,7 @@ ipa_write_summaries_1 (lto_symtab_encoder_t encoder) /* Write out summaries for all the nodes in the callgraph. */ void -ipa_write_summaries (bool offload_lto_mode) +ipa_write_summaries (void) { lto_symtab_encoder_t encoder; int i, order_pos; @@ -2475,7 +2475,7 @@ ipa_write_summaries (bool offload_lto_mode) if ((!flag_generate_lto && !flag_generate_offload) || seen_error ()) return; - select_what_to_stream (offload_lto_mode); + select_what_to_stream (); encoder = lto_symtab_encoder_new (false); diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h index 398ab83a875..9ff5bdc60ce 100644 --- a/gcc/tree-pass.h +++ b/gcc/tree-pass.h @@ -603,7 +603,7 @@ extern void pass_fini_dump_file (opt_pass *); extern const char *get_current_pass_name (void); extern void print_current_pass (FILE *); extern void debug_pass (void); -extern void ipa_write_summaries (bool); +extern void ipa_write_summaries (void); extern void ipa_write_optimization_summaries (struct lto_symtab_encoder_d *); extern void ipa_read_summaries (void); extern void ipa_read_optimization_summaries (void); -- 2.30.2