diff options
author | Trevor Saunders <tsaunders@mozilla.com> | 2014-02-12 05:36:10 -0500 |
---|---|---|
committer | Trevor Saunders <tsaunders@mozilla.com> | 2014-02-18 22:44:44 -0500 |
commit | f06b60692aa6844001682e25907c294a59d34a05 (patch) | |
tree | a45e8fc92529b36a274ae178154f90282c19472e | |
parent | 8fe35d2b87e431896f960ac06560a4e805b70697 (diff) | |
download | gcc-f06b60692aa6844001682e25907c294a59d34a05.tar.gz |
kill more usage of bitmap_clear
-rw-r--r-- | gcc/dce.c | 14 | ||||
-rw-r--r-- | gcc/haifa-sched.c | 4 | ||||
-rw-r--r-- | gcc/ira-build.c | 5 | ||||
-rw-r--r-- | gcc/ira-color.c | 17 | ||||
-rw-r--r-- | gcc/loop-invariant.c | 5 | ||||
-rw-r--r-- | gcc/sched-deps.c | 10 | ||||
-rw-r--r-- | gcc/sched-ebb.c | 4 | ||||
-rw-r--r-- | gcc/sched-rgn.c | 4 | ||||
-rw-r--r-- | gcc/sel-sched.c | 12 | ||||
-rw-r--r-- | gcc/valtrack.c | 4 |
10 files changed, 28 insertions, 51 deletions
diff --git a/gcc/dce.c b/gcc/dce.c index c17846d9cf2..0bb3a635775 100644 --- a/gcc/dce.c +++ b/gcc/dce.c @@ -271,7 +271,7 @@ find_call_stack_args (rtx call_insn, bool do_mark, bool fast, if (!do_mark) { gcc_assert (arg_stores); - bitmap_clear (arg_stores); + arg_stores->clear (); } min_sp_off = INTTYPE_MAXIMUM (HOST_WIDE_INT); @@ -482,7 +482,7 @@ find_call_stack_args (rtx call_insn, bool do_mark, bool fast, } if (!ret && arg_stores) - bitmap_clear (arg_stores); + arg_stores->clear (); return ret; } @@ -638,7 +638,7 @@ prescan_insns_for_dce (bool fast) /* find_call_stack_args only looks at argument stores in the same bb. */ if (arg_stores) - bitmap_clear (arg_stores); + arg_stores->clear (); } if (arg_stores) @@ -849,7 +849,7 @@ word_dce_process_block (basic_block bb, bool redo_out, edge e; edge_iterator ei; df_confluence_function_n con_fun_n = df_word_lr->problem->con_fun_n; - bitmap_clear (DF_WORD_LR_OUT (bb)); + DF_WORD_LR_OUT (bb)->clear (); FOR_EACH_EDGE (e, ei, bb->succs) (*con_fun_n) (e); } @@ -946,7 +946,7 @@ dce_process_block (basic_block bb, bool redo_out, bitmap au, edge e; edge_iterator ei; df_confluence_function_n con_fun_n = df_lr->problem->con_fun_n; - bitmap_clear (DF_LR_OUT (bb)); + DF_LR_OUT (bb)->clear (); FOR_EACH_EDGE (e, ei, bb->succs) (*con_fun_n) (e); } @@ -1105,8 +1105,8 @@ fast_dce (bool word_level) the cheap. */ delete_unmarked_insns (); bitmap_clear (marked); - bitmap_clear (&processed); - bitmap_clear (&redo_out); + processed.clear (); + redo_out.clear (); /* We do not need to rescan any instructions. We only need to redo the dataflow equations for the blocks that had a diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c index 317f4b311ac..6d182ec8b5a 100644 --- a/gcc/haifa-sched.c +++ b/gcc/haifa-sched.c @@ -936,7 +936,7 @@ static bitmap region_ref_regs; void sched_init_region_reg_pressure_info (void) { - bitmap_clear (region_ref_regs); + region_ref_regs->clear (); } /* PRESSURE[CL] describes the pressure on register class CL. Update it @@ -996,7 +996,7 @@ initiate_reg_pressure_info (bitmap live) for (i = 0; i < ira_pressure_classes_num; i++) curr_reg_pressure[ira_pressure_classes[i]] = 0; - bitmap_clear (curr_reg_live); + curr_reg_live->clear (); EXECUTE_IF_SET_IN_BITMAP (live, 0, j, bi) if (sched_pressure == SCHED_PRESSURE_MODEL || current_nr_blocks == 1 diff --git a/gcc/ira-build.c b/gcc/ira-build.c index 292d92aef7b..f622fc5e11c 100644 --- a/gcc/ira-build.c +++ b/gcc/ira-build.c @@ -2685,11 +2685,6 @@ update_bad_spill_attribute (void) } } } - for (i = 0; i < ira_allocno_classes_num; i++) - { - aclass = ira_allocno_classes[i]; - bitmap_clear (&dead_points[aclass]); - } } diff --git a/gcc/ira-color.c b/gcc/ira-color.c index 731276bb8c6..ebbe0d883ed 100644 --- a/gcc/ira-color.c +++ b/gcc/ira-color.c @@ -3623,10 +3623,6 @@ conflict_by_live_ranges_p (int regno1, int regno2) next_coalesced_allocno containing more one allocno. */ static bool allocno_coalesced_p; -/* Bitmap used to prevent a repeated allocno processing because of - coalescing. */ -static bitmap processed_coalesced_allocno_bitmap; - /* See below. */ typedef struct coalesce_data *coalesce_data_t; @@ -3683,17 +3679,6 @@ coalesced_allocno_conflict_p (ira_allocno_t a1, ira_allocno_t a2) { ira_allocno_t a, conflict_a; - if (allocno_coalesced_p) - { - bitmap_clear (processed_coalesced_allocno_bitmap); - for (a = ALLOCNO_COALESCE_DATA (a1)->next;; - a = ALLOCNO_COALESCE_DATA (a)->next) - { - processed_coalesced_allocno_bitmap->set_bit (ALLOCNO_NUM (a)); - if (a == a1) - break; - } - } for (a = ALLOCNO_COALESCE_DATA (a2)->next;; a = ALLOCNO_COALESCE_DATA (a)->next) { @@ -4076,7 +4061,6 @@ ira_sort_regnos_for_alter_reg (int *pseudo_regnos, int n, coloring_allocno_bitmap->set_bit (ALLOCNO_NUM (allocno)); } allocno_coalesced_p = false; - processed_coalesced_allocno_bitmap = ira_allocate_bitmap (); allocno_coalesce_data = (coalesce_data_t) ira_allocate (sizeof (struct coalesce_data) * ira_allocnos_num); @@ -4114,7 +4098,6 @@ ira_sort_regnos_for_alter_reg (int *pseudo_regnos, int n, num = collect_spilled_coalesced_allocnos (pseudo_regnos, n, spilled_coalesced_allocnos); } - ira_free_bitmap (processed_coalesced_allocno_bitmap); allocno_coalesced_p = false; /* Assign stack slot numbers to spilled allocno sets, use smaller numbers for most frequently used coalesced allocnos. -1 is diff --git a/gcc/loop-invariant.c b/gcc/loop-invariant.c index 4bdd26d1609..3d7f780aacd 100644 --- a/gcc/loop-invariant.c +++ b/gcc/loop-invariant.c @@ -1602,8 +1602,7 @@ free_loop_data (struct loop *loop) if (!data) return; - bitmap_clear (&LOOP_DATA (loop)->regs_ref); - bitmap_clear (&LOOP_DATA (loop)->regs_live); + data->~loop_data (); free (data); loop->aux = NULL; } @@ -1867,7 +1866,7 @@ calculate_loop_reg_pressure (void) } } } - bitmap_clear (&curr_regs_live); + curr_regs_live.clear (); if (flag_ira_region == IRA_REGION_MIXED || flag_ira_region == IRA_REGION_ALL) FOR_EACH_LOOP (loop, 0) diff --git a/gcc/sched-deps.c b/gcc/sched-deps.c index eb03ee7dfa8..b54a31cd71e 100644 --- a/gcc/sched-deps.c +++ b/gcc/sched-deps.c @@ -4098,13 +4098,13 @@ sched_deps_finish (void) for (i = 0; i < cache_size; i++) { - bitmap_clear (&true_dependency_cache[i]); - bitmap_clear (&output_dependency_cache[i]); - bitmap_clear (&anti_dependency_cache[i]); - bitmap_clear (&control_dependency_cache[i]); + true_dependency_cache[i].clear (); + output_dependency_cache[i].clear (); + anti_dependency_cache[i].clear (); + control_dependency_cache[i].clear (); if (sched_deps_info->generate_spec_deps) - bitmap_clear (&spec_dependency_cache[i]); + spec_dependency_cache[i].clear (); } free (true_dependency_cache); true_dependency_cache = NULL; diff --git a/gcc/sched-ebb.c b/gcc/sched-ebb.c index c3785f22cf5..fd054b310dc 100644 --- a/gcc/sched-ebb.c +++ b/gcc/sched-ebb.c @@ -596,14 +596,14 @@ schedule_ebbs_init (void) compute_bb_for_insn (); /* Initialize DONT_CALC_DEPS and ebb-{start, end} markers. */ - bitmap_clear (&dont_calc_deps); + dont_calc_deps.clear (); } /* Perform cleanups after scheduling using schedules_ebbs or schedule_ebb. */ void schedule_ebbs_finish (void) { - bitmap_clear (&dont_calc_deps); + dont_calc_deps.clear (); /* Reposition the prologue and epilogue notes in case we moved the prologue/epilogue insns. */ diff --git a/gcc/sched-rgn.c b/gcc/sched-rgn.c index eed7f7e3bb9..f389fc1746e 100644 --- a/gcc/sched-rgn.c +++ b/gcc/sched-rgn.c @@ -3407,7 +3407,7 @@ schedule_insns (void) haifa_sched_init (); sched_rgn_init (reload_completed); - bitmap_clear (¬_in_df); + not_in_df.clear (); /* Schedule every region in the subroutine. */ for (rgn = 0; rgn < nr_regions; rgn++) @@ -3416,7 +3416,7 @@ schedule_insns (void) /* Clean up. */ sched_rgn_finish (); - bitmap_clear (¬_in_df); + not_in_df.clear (); haifa_sched_finish (); } diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c index d23920fe733..ba14f2de605 100644 --- a/gcc/sel-sched.c +++ b/gcc/sel-sched.c @@ -3301,7 +3301,7 @@ find_used_regs (insn_t insn, av_set_t orig_ops, regset used_regs, struct cmpd_local_params lparams; /* We haven't visited any blocks yet. */ - bitmap_clear (code_motion_visited_blocks); + code_motion_visited_blocks->clear (); /* Init parameters for code_motion_path_driver. */ sparams.crosses_call = false; @@ -5296,8 +5296,8 @@ move_exprs_to_boundary (bnd_t bnd, expr_t expr_vliw, at before BND_TO (BND). */ n_bookkeeping_copies_before_moveop = stat_bookkeeping_copies; max_uid_before_move_op = get_max_uid (); - bitmap_clear (current_copies); - bitmap_clear (current_originators); + current_copies->clear (); + current_originators->clear (); b = move_op (BND_TO (bnd), expr_seq, expr_vliw, get_dest_from_orig_ops (expr_seq), c_expr, &should_move); @@ -6779,7 +6779,7 @@ move_op (insn_t insn, av_set_t orig_ops, expr_t expr_vliw, lparams.e1 = NULL; /* We haven't visited any blocks yet. */ - bitmap_clear (code_motion_visited_blocks); + code_motion_visited_blocks->clear (); /* Set appropriate hooks and data. */ code_motion_path_driver_info = &move_op_hooks; @@ -7020,7 +7020,7 @@ sel_region_init (int rgn) memset (reg_rename_tick, 0, sizeof reg_rename_tick); reg_rename_this_tick = 0; - bitmap_clear (&forced_ebb_heads); + forced_ebb_heads.clear (); setup_nop_vinsn (); current_copies = BITMAP_ALLOC (NULL); @@ -7360,7 +7360,7 @@ sel_region_finish (bool reset_sched_cycles_p) sel_finish_global_and_expr (); - bitmap_clear (&forced_ebb_heads); + forced_ebb_heads.clear (); free_nop_vinsn (); diff --git a/gcc/valtrack.c b/gcc/valtrack.c index 9d47a842ac9..772adab7bfa 100644 --- a/gcc/valtrack.c +++ b/gcc/valtrack.c @@ -215,7 +215,7 @@ dead_debug_global_init (struct dead_debug_global *debug, bitmap used) { debug->used = used; if (used) - bitmap_clear (used); + used->clear (); } /* Initialize DEBUG to an empty list, and clear USED, if given. Link @@ -238,7 +238,7 @@ dead_debug_local_init (struct dead_debug_local *debug, bitmap used, if (global && global->used) bitmap_copy (used, global->used); else - bitmap_clear (used); + used->clear (); } } |