diff options
Diffstat (limited to 'gcc/domwalk.c')
| -rw-r--r-- | gcc/domwalk.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/gcc/domwalk.c b/gcc/domwalk.c index cec95a5f932..8f779225432 100644 --- a/gcc/domwalk.c +++ b/gcc/domwalk.c @@ -144,7 +144,7 @@ walk_dominator_tree (struct dom_walk_data *walk_data, basic_block bb) { void *bd = NULL; basic_block dest; - block_stmt_iterator bsi; + gimple_stmt_iterator gsi; bool is_interesting; basic_block *worklist = XNEWVEC (basic_block, n_basic_blocks * 2); int sp = 0; @@ -168,8 +168,8 @@ walk_dominator_tree (struct dom_walk_data *walk_data, basic_block bb) { bool recycled; - /* First get some local data, reusing any local data pointer we may - have saved. */ + /* First get some local data, reusing any local data + pointer we may have saved. */ if (VEC_length (void_p, walk_data->free_block_data) > 0) { bd = VEC_pop (void_p, walk_data->free_block_data); @@ -199,13 +199,14 @@ walk_dominator_tree (struct dom_walk_data *walk_data, basic_block bb) if (is_interesting && walk_data->before_dom_children_walk_stmts) { if (walk_data->walk_stmts_backward) - for (bsi = bsi_last (bb); !bsi_end_p (bsi); bsi_prev (&bsi)) + for (gsi = gsi_last (bb_seq (bb)); !gsi_end_p (gsi); + gsi_prev (&gsi)) (*walk_data->before_dom_children_walk_stmts) (walk_data, bb, - bsi); + gsi); else - for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi)) + for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) (*walk_data->before_dom_children_walk_stmts) (walk_data, bb, - bsi); + gsi); } /* Callback for operations to execute before we have walked the @@ -239,13 +240,14 @@ walk_dominator_tree (struct dom_walk_data *walk_data, basic_block bb) if (is_interesting && walk_data->after_dom_children_walk_stmts) { if (walk_data->walk_stmts_backward) - for (bsi = bsi_last (bb); !bsi_end_p (bsi); bsi_prev (&bsi)) + for (gsi = gsi_last (bb_seq (bb)); !gsi_end_p (gsi); + gsi_prev (&gsi)) (*walk_data->after_dom_children_walk_stmts) (walk_data, bb, - bsi); + gsi); else - for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi)) + for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) (*walk_data->after_dom_children_walk_stmts) (walk_data, bb, - bsi); + gsi); } /* Callback for operations to execute after we have walked the |
