From a398224a884b8cdde4cf59c9b8f7045936c3cb82 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 10 Aug 2010 14:31:52 +0000 Subject: [PATCH] basic-block.h (alloc_aux_for_block, [...]): Delete. * basic-block.h (alloc_aux_for_block, alloc_aux_for_edge): Delete. * cfg.c (alloc_aux_for_block, alloc_aux_for_edge): Make static. (alloc_aux_for_blocks, clear_aux_for_blocks): Use FOR_ALL_BB. From-SVN: r163066 --- gcc/ChangeLog | 6 ++++++ gcc/basic-block.h | 2 -- gcc/cfg.c | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7bc5b2c891ee..530b45cba96c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-08-10 Nathan Froyd + + * basic-block.h (alloc_aux_for_block, alloc_aux_for_edge): Delete. + * cfg.c (alloc_aux_for_block, alloc_aux_for_edge): Make static. + (alloc_aux_for_blocks, clear_aux_for_blocks): Use FOR_ALL_BB. + 2010-08-10 Nathan Froyd * dwarf2out.c (struct die_struct): Move die_tag to the end. diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 1bf192d47f7c..692ebe65cc4b 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -783,11 +783,9 @@ extern void link_block (basic_block, basic_block); extern void unlink_block (basic_block); extern void compact_blocks (void); extern basic_block alloc_block (void); -extern void alloc_aux_for_block (basic_block, int); extern void alloc_aux_for_blocks (int); extern void clear_aux_for_blocks (void); extern void free_aux_for_blocks (void); -extern void alloc_aux_for_edge (edge, int); extern void alloc_aux_for_edges (int); extern void clear_aux_for_edges (void); extern void free_aux_for_edges (void); diff --git a/gcc/cfg.c b/gcc/cfg.c index 127f08c75dff..3a82d937a2fe 100644 --- a/gcc/cfg.c +++ b/gcc/cfg.c @@ -735,7 +735,7 @@ static void *first_edge_aux_obj = 0; /* Allocate a memory block of SIZE as BB->aux. The obstack must be first initialized by alloc_aux_for_blocks. */ -void +static void alloc_aux_for_block (basic_block bb, int size) { /* Verify that aux field is clear. */ @@ -766,7 +766,7 @@ alloc_aux_for_blocks (int size) { basic_block bb; - FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR, NULL, next_bb) + FOR_ALL_BB (bb) alloc_aux_for_block (bb, size); } } @@ -778,7 +778,7 @@ clear_aux_for_blocks (void) { basic_block bb; - FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR, NULL, next_bb) + FOR_ALL_BB (bb) bb->aux = NULL; } @@ -798,7 +798,7 @@ free_aux_for_blocks (void) /* Allocate a memory edge of SIZE as BB->aux. The obstack must be first initialized by alloc_aux_for_edges. */ -void +static void alloc_aux_for_edge (edge e, int size) { /* Verify that aux field is clear. */