Rename label_to_block_map_for_function to label_to_block_map_for_fn.

gcc/
	* basic-block.h (label_to_block_map_for_function): Rename to...
	(label_to_block_map_for_fn): ...this.

	* lto-streamer-in.c (input_cfg): Update for renaming.
	* tree-cfg.c (init_empty_tree_cfg_for_function): Likewise.

From-SVN: r205818

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 01531f38dbe95894456870ac94916fa54799c04e..065b059484361d4b545341fa3042ea3296b8d26e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-09  David Malcolm  <dmalcolm@redhat.com>
+
+       * basic-block.h (label_to_block_map_for_function): Rename to...
+       (label_to_block_map_for_fn): ...this.
+
+       * lto-streamer-in.c (input_cfg): Update for renaming.
+       * tree-cfg.c (init_empty_tree_cfg_for_function): Likewise.
+
 2013-12-09  David Malcolm  <dmalcolm@redhat.com>
 
        * basic-block.h (last_basic_block_for_function): Rename to...

diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 88b0e489fd771a9a94226548c478bdd9daee7f07..1471972c4bbe7e6b44af82060f4d8c32c0b0bb11 100644 (file)
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -318,7 +318,7 @@ struct GTY(()) control_flow_graph {
 #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_fn(FN)         ((FN)->cfg->x_last_basic_block)
-#define label_to_block_map_for_function(FN)  ((FN)->cfg->x_label_to_block_map)
+#define label_to_block_map_for_fn(FN)       ((FN)->cfg->x_label_to_block_map)
 #define profile_status_for_function(FN)             ((FN)->cfg->x_profile_status)
 
 #define BASIC_BLOCK_FOR_FN(FN,N) \

diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c
index 9ad4f5ff87fd54d3775c0337320878d028a8e666..91fb12d1183ee2346c6d6ab93b5eb44ff5cbb5a7 100644 (file)
--- a/gcc/lto-streamer-in.c
+++ b/gcc/lto-streamer-in.c
@@ -641,8 +641,8 @@ input_cfg (struct lto_input_block *ib, struct data_in *data_in,
   if (bb_count > basic_block_info_for_fn (fn)->length ())
     vec_safe_grow_cleared (basic_block_info_for_fn (fn), bb_count);
 
-  if (bb_count > label_to_block_map_for_function (fn)->length ())
-    vec_safe_grow_cleared (label_to_block_map_for_function (fn), bb_count);
+  if (bb_count > label_to_block_map_for_fn (fn)->length ())
+    vec_safe_grow_cleared (label_to_block_map_for_fn (fn), bb_count);
 
   index = streamer_read_hwi (ib);
   while (index != -1)

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 3df4cbeddadcedc71d0e8f70e863a8f7895853ce..998ee26e7d6f30d8460004fc1a6e0ea1680a974d 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -190,8 +190,8 @@ init_empty_tree_cfg_for_function (struct function *fn)
                         initial_cfg_capacity);
 
   /* Build a mapping of labels to their associated blocks.  */
-  vec_alloc (label_to_block_map_for_function (fn), initial_cfg_capacity);
-  vec_safe_grow_cleared (label_to_block_map_for_function (fn),
+  vec_alloc (label_to_block_map_for_fn (fn), initial_cfg_capacity);
+  vec_safe_grow_cleared (label_to_block_map_for_fn (fn),
                         initial_cfg_capacity);
 
   SET_BASIC_BLOCK_FOR_FN (fn, ENTRY_BLOCK, ENTRY_BLOCK_PTR_FOR_FN (fn));