From bbd7925926feee79874da1c763e4af2b2de62244 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Mon, 9 Dec 2013 19:28:00 +0000 Subject: Rename macros (basic_block_info_for_function, BASIC_BLOCK_FOR_FUNCTION, SET_BASIC_BLOCK_FOR_FUNCTION) gcc/ * basic-block.h (basic_block_info_for_function): Rename to... (basic_block_info_for_fn): ...this. (BASIC_BLOCK_FOR_FUNCTION): Rename to... (BASIC_BLOCK_FOR_FN): ...this. (SET_BASIC_BLOCK_FOR_FUNCTION): Rename to... (SET_BASIC_BLOCK_FOR_FN): ...this. * gimple-streamer-in.c (input_phi, input_bb): Update for renaming of BASIC_BLOCK_FOR_FUNCTION to BASIC_BLOCK_FOR_FN. * ipa-utils.c (ipa_merge_profiles): Likewise. * lto-streamer-in.c (make_new_block): Update for renaming of SET_BASIC_BLOCK_FOR_FUNCTION to SET_BASIC_BLOCK_FOR_FN. (input_cfg): Update for renamings. * tree-cfg.c (init_empty_tree_cfg_for_function): Likewise. (dump_function_to_file): Update for renaming of basic_block_info_for_function to basic_block_info_for_fn. From-SVN: r205816 --- gcc/tree-cfg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gcc/tree-cfg.c') diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 6d1ebe6..e4a1371 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -185,8 +185,8 @@ init_empty_tree_cfg_for_function (struct function *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; - vec_alloc (basic_block_info_for_function (fn), initial_cfg_capacity); - vec_safe_grow_cleared (basic_block_info_for_function (fn), + vec_alloc (basic_block_info_for_fn (fn), initial_cfg_capacity); + vec_safe_grow_cleared (basic_block_info_for_fn (fn), initial_cfg_capacity); /* Build a mapping of labels to their associated blocks. */ @@ -194,10 +194,8 @@ init_empty_tree_cfg_for_function (struct function *fn) vec_safe_grow_cleared (label_to_block_map_for_function (fn), initial_cfg_capacity); - SET_BASIC_BLOCK_FOR_FUNCTION (fn, ENTRY_BLOCK, - ENTRY_BLOCK_PTR_FOR_FN (fn)); - SET_BASIC_BLOCK_FOR_FUNCTION (fn, EXIT_BLOCK, - EXIT_BLOCK_PTR_FOR_FN (fn)); + SET_BASIC_BLOCK_FOR_FN (fn, ENTRY_BLOCK, ENTRY_BLOCK_PTR_FOR_FN (fn)); + SET_BASIC_BLOCK_FOR_FN (fn, EXIT_BLOCK, EXIT_BLOCK_PTR_FOR_FN (fn)); ENTRY_BLOCK_PTR_FOR_FN (fn)->next_bb = EXIT_BLOCK_PTR_FOR_FN (fn); @@ -7046,7 +7044,7 @@ dump_function_to_file (tree fndecl, FILE *file, int flags) if (fun && fun->decl == fndecl && fun->cfg - && basic_block_info_for_function (fun)) + && basic_block_info_for_fn (fun)) { /* If the CFG has been built, emit a CFG-based dump. */ if (!ignore_topmost_bind) -- cgit v1.1