1 files changed, 31 insertions, 31 deletions

diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c
index 61cf1416962..147197f5ba6 100644
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -693,7 +693,7 @@ extract_new_fences_from (flist_t old_fences, flist_tail_t new_fences,
           else
             {
               /* Mark block of the SUCC as head of the new ebb.  */
-              bitmap_set_bit (forced_ebb_heads, BLOCK_NUM (succ));
+              forced_ebb_heads->set_bit (BLOCK_NUM (succ));
               add_clean_fence_to_fences (new_fences, succ, fence);
             }
         }
@@ -1682,8 +1682,8 @@ find_best_reg_for_expr (expr_t expr, blist_t bnds, bool *is_orig_reg_p)
   *is_orig_reg_p = false;
 
   /* Don't bother to do anything if this insn doesn't set any registers.  */
-  if (bitmap_empty_p (VINSN_REG_SETS (EXPR_VINSN (expr)))
-      && bitmap_empty_p (VINSN_REG_CLOBBERS (EXPR_VINSN (expr))))
+  if (VINSN_REG_SETS (EXPR_VINSN (expr))->is_empty ()
+      && VINSN_REG_CLOBBERS (EXPR_VINSN (expr))->is_empty ())
     return true;
 
   used_regs = get_clear_regset_from_pool ();
@@ -2499,18 +2499,18 @@ update_bitmap_cache (expr_t expr, insn_t insn, bool inside_insn_group,
 
   if (res == MOVEUP_EXPR_NULL)
     {
-      bitmap_set_bit (INSN_ANALYZED_DEPS (insn), expr_uid);
-      bitmap_set_bit (INSN_FOUND_DEPS (insn), expr_uid);
+      INSN_ANALYZED_DEPS (insn)->set_bit (expr_uid);
+      INSN_FOUND_DEPS (insn)->set_bit (expr_uid);
     }
   else if (res == MOVEUP_EXPR_SAME)
     {
-      bitmap_set_bit (INSN_ANALYZED_DEPS (insn), expr_uid);
-      bitmap_clear_bit (INSN_FOUND_DEPS (insn), expr_uid);
+      INSN_ANALYZED_DEPS (insn)->set_bit (expr_uid);
+      INSN_FOUND_DEPS (insn)->clear_bit (expr_uid);
     }
   else if (res == MOVEUP_EXPR_AS_RHS)
     {
-      bitmap_clear_bit (INSN_ANALYZED_DEPS (insn), expr_uid);
-      bitmap_set_bit (INSN_FOUND_DEPS (insn), expr_uid);
+      INSN_ANALYZED_DEPS (insn)->clear_bit (expr_uid);
+      INSN_FOUND_DEPS (insn)->set_bit (expr_uid);
     }
   else
     gcc_unreachable ();
@@ -3300,7 +3300,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;
@@ -4697,8 +4697,8 @@ create_block_for_bookkeeping (edge e1, edge e2)
 		if (INSN_P (insn))
 		  EXPR_ORIG_BB_INDEX (INSN_EXPR (insn)) = succ->index;
 
-	      if (bitmap_clear_bit (code_motion_visited_blocks, new_bb->index))
-		bitmap_set_bit (code_motion_visited_blocks, succ->index);
+	      if (code_motion_visited_blocks->clear_bit (new_bb->index))
+		code_motion_visited_blocks->set_bit (succ->index);
 
 	      gcc_assert (LABEL_P (BB_HEAD (new_bb))
 			  && LABEL_P (BB_HEAD (succ)));
@@ -4832,7 +4832,7 @@ emit_bookkeeping_insn (insn_t place_to_insert, expr_t c_expr, int new_seqno)
 					       place_to_insert);
 
   INSN_SCHED_TIMES (new_insn) = 0;
-  bitmap_set_bit (current_copies, INSN_UID (new_insn));
+  current_copies->set_bit (INSN_UID (new_insn));
 
   return new_insn;
 }
@@ -5285,8 +5285,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);
@@ -5875,14 +5875,14 @@ track_scheduled_insns_and_blocks (rtx insn)
 {
   /* Even if this insn can be a copy that will be removed during current move_op,
      we still need to count it as an originator.  */
-  bitmap_set_bit (current_originators, INSN_UID (insn));
+  current_originators->set_bit (INSN_UID (insn));
 
-  if (!bitmap_clear_bit (current_copies, INSN_UID (insn)))
+  if (!current_copies->clear_bit (INSN_UID (insn)))
     {
       /* Note that original block needs to be rescheduled, as we pulled an
 	 instruction out of it.  */
       if (INSN_SCHED_TIMES (insn) > 0)
-	bitmap_set_bit (blocks_to_reschedule, BLOCK_FOR_INSN (insn)->index);
+	blocks_to_reschedule->set_bit (BLOCK_FOR_INSN (insn)->index);
       else if (INSN_UID (insn) < first_emitted_uid && !DEBUG_INSN_P (insn))
 	num_insns_scheduled++;
     }
@@ -6731,7 +6731,7 @@ code_motion_path_driver (insn_t insn, av_set_t orig_ops, ilist_t path,
      the numbering by creating bookkeeping blocks.  */
   if (removed_last_insn)
     insn = PREV_INSN (insn);
-  bitmap_set_bit (code_motion_visited_blocks, BLOCK_FOR_INSN (insn)->index);
+  code_motion_visited_blocks->set_bit (BLOCK_FOR_INSN (insn)->index);
   return true;
 }
 
@@ -6764,7 +6764,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;
@@ -6799,7 +6799,7 @@ init_seqno_1 (basic_block bb, sbitmap visited_bbs, bitmap blocks_to_reschedule)
 
   bitmap_set_bit (visited_bbs, bbi);
   if (blocks_to_reschedule)
-    bitmap_clear_bit (blocks_to_reschedule, bb->index);
+    blocks_to_reschedule->clear_bit (bb->index);
 
   FOR_EACH_SUCC_1 (succ_insn, si, BB_END (bb),
 		   SUCCS_NORMAL | SUCCS_SKIP_TO_LOOP_EXITS)
@@ -6816,7 +6816,7 @@ init_seqno_1 (basic_block bb, sbitmap visited_bbs, bitmap blocks_to_reschedule)
 	  init_seqno_1 (succ, visited_bbs, blocks_to_reschedule);
 	}
       else if (blocks_to_reschedule)
-        bitmap_set_bit (forced_ebb_heads, succ->index);
+        forced_ebb_heads->set_bit (succ->index);
     }
 
   for (insn = BB_END (bb); insn != note; insn = PREV_INSN (insn))
@@ -7005,7 +7005,7 @@ sel_region_init (int rgn)
   reg_rename_this_tick = 0;
 
   bitmap_initialize (forced_ebb_heads, 0);
-  bitmap_clear (forced_ebb_heads);
+  forced_ebb_heads->clear ();
 
   setup_nop_vinsn ();
   current_copies = BITMAP_ALLOC (NULL);
@@ -7050,7 +7050,7 @@ find_ebb_boundaries (basic_block bb, bitmap scheduled_blocks)
 
   do
     {
-      bitmap_set_bit (scheduled_blocks, BLOCK_TO_BB (bb1->index));
+      scheduled_blocks->set_bit (BLOCK_TO_BB (bb1->index));
 
       if (sched_verbose >= 2)
 	sel_print ("%d; ", bb1->index);
@@ -7345,7 +7345,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 ();
 
@@ -7622,21 +7622,21 @@ sel_sched_region_1 (void)
               if (bitmap_bit_p (blocks_to_reschedule, bb->index))
                 {
                   if (! bb_ends_ebb_p (bb))
-                    bitmap_set_bit (blocks_to_reschedule, bb_next_bb (bb)->index);
+                    blocks_to_reschedule->set_bit (bb_next_bb (bb)->index);
                   if (sel_bb_empty_p (bb))
                     {
-                      bitmap_clear_bit (blocks_to_reschedule, bb->index);
+                      blocks_to_reschedule->clear_bit (bb->index);
                       continue;
                     }
                   clear_outdated_rtx_info (bb);
                   if (sel_insn_is_speculation_check (BB_END (bb))
                       && JUMP_P (BB_END (bb)))
-                    bitmap_set_bit (blocks_to_reschedule,
-                                    BRANCH_EDGE (bb)->dest->index);
+                    blocks_to_reschedule->set_bit
+                                    (BRANCH_EDGE (bb)->dest->index);
                 }
               else if (! sel_bb_empty_p (bb)
                        && INSN_SCHED_TIMES (sel_bb_head (bb)) <= 0)
-                bitmap_set_bit (blocks_to_reschedule, bb->index);
+                blocks_to_reschedule->set_bit (bb->index);
             }
 
           for (i = 0; i < current_nr_blocks; i++)
@@ -7659,7 +7659,7 @@ sel_sched_region_1 (void)
                   orig_max_seqno = init_seqno (blocks_to_reschedule, bb);
 
                   /* Mark BB as head of the new ebb.  */
-                  bitmap_set_bit (forced_ebb_heads, bb->index);
+                  forced_ebb_heads->set_bit (bb->index);
 
                   gcc_assert (fences == NULL);