diff options
| -rw-r--r-- | gcc/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/basic-block.h | 2 | ||||
| -rw-r--r-- | gcc/ipa-utils.c | 4 | ||||
| -rw-r--r-- | gcc/lto-streamer-in.c | 2 | ||||
| -rw-r--r-- | gcc/lto-streamer-out.c | 2 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 2 | ||||
| -rw-r--r-- | gcc/tree-sra.c | 4 |
7 files changed, 21 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6137c69..01531f3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,18 @@ 2013-12-09 David Malcolm <dmalcolm@redhat.com> + * basic-block.h (last_basic_block_for_function): Rename to... + (last_basic_block_for_fn): ...this. + + * ipa-utils.c (ipa_merge_profiles): Update for renaming of + last_basic_block_for_function to last_basic_block_for_fn. + * lto-streamer-in.c (input_cfg): Likewise. + * lto-streamer-out.c (output_cfg): Likewise. + * tree-cfg.c (init_empty_tree_cfg_for_function): Likewise. + * tree-sra.c (propagate_dereference_distances, ipa_early_sra): + Likewise. + +2013-12-09 David Malcolm <dmalcolm@redhat.com> + * basic-block.h (basic_block_info_for_function): Rename to... (basic_block_info_for_fn): ...this. (BASIC_BLOCK_FOR_FUNCTION): Rename to... diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 234f6e9..88b0e48 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -317,7 +317,7 @@ struct GTY(()) control_flow_graph { #define basic_block_info_for_fn(FN) ((FN)->cfg->x_basic_block_info) #define n_basic_blocks_for_fn(FN) ((FN)->cfg->x_n_basic_blocks) #define n_edges_for_fn(FN) ((FN)->cfg->x_n_edges) -#define last_basic_block_for_function(FN) ((FN)->cfg->x_last_basic_block) +#define last_basic_block_for_fn(FN) ((FN)->cfg->x_last_basic_block) #define label_to_block_map_for_function(FN) ((FN)->cfg->x_label_to_block_map) #define profile_status_for_function(FN) ((FN)->cfg->x_profile_status) diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c index 5169bcc..9297280 100644 --- a/gcc/ipa-utils.c +++ b/gcc/ipa-utils.c @@ -711,8 +711,8 @@ ipa_merge_profiles (struct cgraph_node *dst, "Giving up; number of basic block mismatch.\n"); match = false; } - else if (last_basic_block_for_function (srccfun) - != last_basic_block_for_function (dstcfun)) + else if (last_basic_block_for_fn (srccfun) + != last_basic_block_for_fn (dstcfun)) { if (cgraph_dump_file) fprintf (cgraph_dump_file, diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index 5a604d3..9ad4f5f 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -637,7 +637,7 @@ input_cfg (struct lto_input_block *ib, struct data_in *data_in, bb_count = streamer_read_uhwi (ib); - last_basic_block_for_function (fn) = bb_count; + last_basic_block_for_fn (fn) = bb_count; if (bb_count > basic_block_info_for_fn (fn)->length ()) vec_safe_grow_cleared (basic_block_info_for_fn (fn), bb_count); diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index 03e7c61..50d8bf9 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -1633,7 +1633,7 @@ output_cfg (struct output_block *ob, struct function *fn) profile_status_for_function (fn)); /* Output the number of the highest basic block. */ - streamer_write_uhwi (ob, last_basic_block_for_function (fn)); + streamer_write_uhwi (ob, last_basic_block_for_fn (fn)); FOR_ALL_BB_FN (bb, fn) { diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index e4a1371..3df4cbe 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -184,7 +184,7 @@ init_empty_tree_cfg_for_function (struct function *fn) init_flow (fn); profile_status_for_function (fn) = PROFILE_ABSENT; n_basic_blocks_for_fn (fn) = NUM_FIXED_BLOCKS; - last_basic_block_for_function (fn) = NUM_FIXED_BLOCKS; + last_basic_block_for_fn (fn) = NUM_FIXED_BLOCKS; vec_alloc (basic_block_info_for_fn (fn), initial_cfg_capacity); vec_safe_grow_cleared (basic_block_info_for_fn (fn), initial_cfg_capacity); diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index 0890613..9aa526f 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -3793,7 +3793,7 @@ propagate_dereference_distances (void) { basic_block bb; - auto_vec<basic_block> queue (last_basic_block_for_function (cfun)); + auto_vec<basic_block> queue (last_basic_block_for_fn (cfun)); queue.quick_push (ENTRY_BLOCK_PTR_FOR_FN (cfun)); FOR_EACH_BB (bb) { @@ -4970,7 +4970,7 @@ ipa_early_sra (void) bb_dereferences = XCNEWVEC (HOST_WIDE_INT, func_param_count - * last_basic_block_for_function (cfun)); + * last_basic_block_for_fn (cfun)); final_bbs = BITMAP_ALLOC (NULL); scan_function (); |