From dc936fb236f9e85b88a8f59e2d33af2b76b786f7 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 19 Nov 2013 16:50:04 +0000 Subject: Eliminate n_edges macro * basic-block.h (n_edges_for_function): Rename macro to... (n_edges_for_fn): ...this. (n_edges): Eliminate macro as work towards making uses of cfun be explicit. * cfg.c (init_flow): Update for renaming of "n_edges_for_function" to "n_edges_for_fn". * cfg.c (unchecked_make_edge): Remove usage of n_edges macro. (clear_edges): Likewise. (free_edge): Likewise. * cfghooks.c (dump_flow_info): Likewise. * cprop.c (is_too_expensive): Likewise. * df-core.c (df_worklist_dataflow_doublequeue): Likewise. * gcse.c (is_too_expensive): Likewise. (prune_insertions_deletions): Likewise. * mcf.c (create_fixup_graph): Likewise. * sched-rgn.c (haifa_find_rgns): Likewise. * tree-cfg.c (gimple_dump_cfg): Likewise. * var-tracking.c (variable_tracking_main_1): Likewise. From-SVN: r205044 --- gcc/mcf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gcc/mcf.c') diff --git a/gcc/mcf.c b/gcc/mcf.c index e0e40d8..45adda3 100644 --- a/gcc/mcf.c +++ b/gcc/mcf.c @@ -472,11 +472,13 @@ create_fixup_graph (fixup_graph_type *fixup_graph) /* Each basic_block will be split into 2 during vertex transformation. */ int fnum_vertices_after_transform = 2 * n_basic_blocks_for_fn (cfun); - int fnum_edges_after_transform = n_edges + n_basic_blocks_for_fn (cfun); + int fnum_edges_after_transform = + n_edges_for_fn (cfun) + n_basic_blocks_for_fn (cfun); /* Count the new SOURCE and EXIT vertices to be added. */ int fmax_num_vertices = - fnum_vertices_after_transform + n_edges + n_basic_blocks_for_fn (cfun) + 2; + (fnum_vertices_after_transform + n_edges_for_fn (cfun) + + n_basic_blocks_for_fn (cfun) + 2); /* In create_fixup_graph: Each basic block and edge can be split into 3 edges. Number of balance edges = n_basic_blocks. So after @@ -486,7 +488,8 @@ create_fixup_graph (fixup_graph_type *fixup_graph) max_edges = 2 * (4 * n_basic_blocks + 3 * n_edges) = 8 * n_basic_blocks + 6 * n_edges < 8 * n_basic_blocks + 8 * n_edges. */ - int fmax_num_edges = 8 * (n_basic_blocks_for_fn (cfun) + n_edges); + int fmax_num_edges = 8 * (n_basic_blocks_for_fn (cfun) + + n_edges_for_fn (cfun)); /* Initial num of vertices in the fixup graph. */ fixup_graph->num_vertices = n_basic_blocks_for_fn (cfun); -- cgit v1.1