kill a bit more useage of bitmap_clear

5 files changed, 15 insertions, 20 deletions

diff --git a/gcc/cfganal.c b/gcc/cfganal.c
index 62b999744eb..c0cd05315f7 100644
--- a/gcc/cfganal.c
+++ b/gcc/cfganal.c
@@ -365,7 +365,7 @@ control_dependences::set_control_dependence_map_bit (basic_block bb,
 void
 control_dependences::clear_control_dependence_bitmap (basic_block bb)
 {
-  bitmap_clear (control_dependence_map[bb->index]);
+  control_dependence_map[bb->index]->clear ();
 }
 
 /* Find the immediate postdominator PDOM of the specified basic block BLOCK.
diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 10e981c748b..cff554fa37e 100644
--- a/gcc/cfgexpand.c
+++ b/gcc/cfgexpand.c
@@ -421,7 +421,7 @@ add_scope_conflicts_1 (basic_block bb, bitmap work, bool for_conflict)
   gimple_stmt_iterator gsi;
   walk_stmt_load_store_addr_fn visit;
 
-  bitmap_clear (work);
+  work->clear ();
   FOR_EACH_EDGE (e, ei, bb->preds)
     bitmap_ior_into (work, (bitmap)e->src->aux);
 
@@ -592,7 +592,7 @@ stack_var_cmp (const void *a, const void *b)
 static void
 add_partitioned_vars_to_ptset (struct pt_solution *pt,
 			       struct pointer_map_t *decls_to_partitions,
-			       struct pointer_set_t *visited, bitmap temp)
+			       struct pointer_set_t *visited)
 {
   bitmap_iterator bi;
   unsigned i;
@@ -605,18 +605,16 @@ add_partitioned_vars_to_ptset (struct pt_solution *pt,
       || pointer_set_insert (visited, pt->vars))
     return;
 
-  bitmap_clear (temp);
-
   /* By using a temporary bitmap to store all members of the partitions
      we have to add we make sure to visit each of the partitions only
      once.  */
+  bitmap_head temp;
   EXECUTE_IF_SET_IN_BITMAP (pt->vars, 0, i, bi)
-    if ((!temp
-	 || !temp->bit (i))
+    if (!temp.bit (i)
 	&& (part = (bitmap *) pointer_map_contains (decls_to_partitions,
 						    (void *)(size_t) i)))
-      bitmap_ior_into (temp, *part);
-  bitmap_ior_into (pt->vars, temp);
+      bitmap_ior_into (&temp, *part);
+  bitmap_ior_into (pt->vars, &temp);
 }
 
 /* Update points-to sets based on partition info, so we can use them on RTL.
@@ -682,7 +680,6 @@ update_alias_info_with_stack_vars (void)
     {
       unsigned i;
       struct pointer_set_t *visited = pointer_set_create ();
-      bitmap_head temp;
 
       for (i = 1; i < num_ssa_names; i++)
 	{
@@ -693,11 +690,11 @@ update_alias_info_with_stack_vars (void)
 	      && POINTER_TYPE_P (TREE_TYPE (name))
 	      && ((pi = SSA_NAME_PTR_INFO (name)) != NULL))
 	    add_partitioned_vars_to_ptset (&pi->pt, decls_to_partitions,
-					   visited, &temp);
+					   visited);
 	}
 
       add_partitioned_vars_to_ptset (&cfun->gimple_df->escaped,
-				     decls_to_partitions, visited, &temp);
+				     decls_to_partitions, visited);
 
       pointer_set_destroy (visited);
       pointer_map_destroy (decls_to_partitions);
diff --git a/gcc/compare-elim.c b/gcc/compare-elim.c
index 86533d7522e..e5b9f1e3080 100644
--- a/gcc/compare-elim.c
+++ b/gcc/compare-elim.c
@@ -262,7 +262,6 @@ find_comparison_dom_walker::before_dom_children (basic_block bb)
   struct comparison *last_cmp;
   rtx insn, next, last_clobber;
   bool last_cmp_valid;
-  bitmap_head killed;
 
 
   /* The last comparison that was made.  Will be reset to NULL
@@ -295,7 +294,7 @@ find_comparison_dom_walker::before_dom_children (basic_block bb)
 	continue;
 
       /* Compute the set of registers modified by this instruction.  */
-      bitmap_clear (&killed);
+      bitmap_head killed;
       df_simulate_find_defs (insn, &killed);
 
       src = conforming_compare (insn);
diff --git a/gcc/dse.c b/gcc/dse.c
index 9e1ef4ead8d..942c93f9248 100644
--- a/gcc/dse.c
+++ b/gcc/dse.c
@@ -2921,7 +2921,7 @@ dse_step2_nospill (void)
 
       memset (group->offset_map_n, 0, sizeof (int) * group->offset_map_size_n);
       memset (group->offset_map_p, 0, sizeof (int) * group->offset_map_size_p);
-      bitmap_clear (group->group_kill);
+      group->group_kill->clear ();
 
       EXECUTE_IF_SET_IN_BITMAP (group->store2_n, 0, j, bi)
 	{
@@ -3197,7 +3197,7 @@ dse_step3_scan (bool for_spills, basic_block bb)
   if (insn_info == bb_info->last_insn)
     {
       if (bb_info->kill)
-	bitmap_clear (bb_info->kill);
+	bb_info->kill->clear ();
       else
 	bb_info->kill = BITMAP_ALLOC (&dse_bitmap_obstack);
     }
@@ -3289,7 +3289,7 @@ dse_step3 (bool for_spills)
     {
       bb_info_t bb_info = bb_table[bb->index];
       if (bb_info->gen)
-	bitmap_clear (bb_info->gen);
+	bb_info->gen->clear ();
       else
 	bb_info->gen = BITMAP_ALLOC (&dse_bitmap_obstack);
 
@@ -3575,7 +3575,7 @@ dse_step5_nospill (void)
 		{
 		  if (dump_file && (dump_flags & TDF_DETAILS))
 		    fprintf (dump_file, "wild read\n");
-		  bitmap_clear (v);
+		  v->clear ();
 		}
 	      else if (insn_info->read_rec
                        || insn_info->non_frame_wild_read)
diff --git a/gcc/init-regs.c b/gcc/init-regs.c
index ea5fef12ee1..d9bfa0036cf 100644
--- a/gcc/init-regs.c
+++ b/gcc/init-regs.c
@@ -49,7 +49,6 @@ static void
 initialize_uninitialized_regs (void)
 {
   basic_block bb;
-  bitmap_head already_genned;
 
   if (optimize == 1)
     {
@@ -64,7 +63,7 @@ initialize_uninitialized_regs (void)
       rtx insn;
       bitmap lr = DF_LR_IN (bb);
       bitmap ur = DF_LIVE_IN (bb);
-      bitmap_clear (&already_genned);
+      bitmap_head already_genned;
 
       FOR_BB_INSNS (bb, insn)
 	{