diff options
| author | Diego Novillo <dnovillo@google.com> | 2007-09-07 12:38:46 -0400 |
|---|---|---|
| committer | Diego Novillo <dnovillo@gcc.gnu.org> | 2007-09-07 12:38:46 -0400 |
| commit | b48d0358542ad050257172d48202f6d59c2d5233 (patch) | |
| tree | 64b3c5dbf6e7dd437d93c22279822b894ac0ccce /gcc/tree-cfg.c | |
| parent | 7c45aad5e61c65820606cf8db78bf15d876b2578 (diff) | |
| download | gcc-b48d0358542ad050257172d48202f6d59c2d5233.zip gcc-b48d0358542ad050257172d48202f6d59c2d5233.tar.gz gcc-b48d0358542ad050257172d48202f6d59c2d5233.tar.bz2 | |
tree-flow.h (const_block_stmt_iterator): Remove.
* tree-flow.h (const_block_stmt_iterator): Remove.
Update all users to use block_stmt_iterator.
* tree-iterator.h (const_tree_stmt_iterator): Remove.
Update all users to use tree_stmt_iterator.
From-SVN: r128246
Diffstat (limited to 'gcc/tree-cfg.c')
| -rw-r--r-- | gcc/tree-cfg.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 8400053..069d330 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -105,7 +105,7 @@ static inline void change_bb_for_stmt (tree t, basic_block bb); /* Flowgraph optimization and cleanup. */ static void tree_merge_blocks (basic_block, basic_block); -static bool tree_can_merge_blocks_p (const_basic_block, const_basic_block); +static bool tree_can_merge_blocks_p (basic_block, basic_block); static void remove_bb (basic_block); static edge find_taken_edge_computed_goto (basic_block, tree); static edge find_taken_edge_cond_expr (basic_block, tree); @@ -1136,10 +1136,10 @@ group_case_labels (void) /* Checks whether we can merge block B into block A. */ static bool -tree_can_merge_blocks_p (const_basic_block a, const_basic_block b) +tree_can_merge_blocks_p (basic_block a, basic_block b) { const_tree stmt; - const_block_stmt_iterator bsi; + block_stmt_iterator bsi; tree phi; if (!single_succ_p (a)) @@ -1161,7 +1161,7 @@ tree_can_merge_blocks_p (const_basic_block a, const_basic_block b) cannot merge the blocks. */ /* This CONST_CAST is okay because last_stmt doesn't modify its argument and the return value is assign to a const_tree. */ - stmt = last_stmt (CONST_CAST_BB(a)); + stmt = last_stmt (CONST_CAST_BB (a)); if (stmt && stmt_ends_bb_p (stmt)) return false; @@ -1187,9 +1187,9 @@ tree_can_merge_blocks_p (const_basic_block a, const_basic_block b) } /* Do not remove user labels. */ - for (bsi = cbsi_start (b); !cbsi_end_p (bsi); cbsi_next (&bsi)) + for (bsi = bsi_start (b); !bsi_end_p (bsi); bsi_next (&bsi)) { - stmt = cbsi_stmt (bsi); + stmt = bsi_stmt (bsi); if (TREE_CODE (stmt) != LABEL_EXPR) break; if (!DECL_ARTIFICIAL (LABEL_EXPR_LABEL (stmt))) @@ -6037,10 +6037,10 @@ debug_loop_ir (void) otherwise. */ static bool -tree_block_ends_with_call_p (const_basic_block bb) +tree_block_ends_with_call_p (basic_block bb) { - const_block_stmt_iterator bsi = cbsi_last (bb); - return const_get_call_expr_in (cbsi_stmt (bsi)) != NULL; + block_stmt_iterator bsi = bsi_last (bb); + return const_get_call_expr_in (bsi_stmt (bsi)) != NULL; } |