This patch normalizes more bitmap function names.

  sbitmap.h

    TEST_BIT -> bitmap_bit_p
    SET_BIT -> bitmap_set_bit
    SET_BIT_WITH_POPCOUNT -> bitmap_set_bit_with_popcount
    RESET_BIT -> bitmap_clear_bit
    RESET_BIT_WITH_POPCOUNT -> bitmap_clear_bit_with_popcount

  basic-block.h

    sbitmap_intersection_of_succs -> bitmap_intersection_of_succs
    sbitmap_intersection_of_preds -> bitmap_intersection_of_preds
    sbitmap_union_of_succs -> bitmap_union_of_succs
    sbitmap_union_of_preds -> bitmap_union_of_preds

The sbitmap.h functions also needed their numeric paramter changed
from unsigned int to int to match the bitmap functions.

Callers updated to match.

Tested on x86-64, config-list.mk testing.


Index: gcc/ChangeLog

2012-11-01  Lawrence Crowl  <crowl@google.com>

	* sbitmap.h (TEST_BIT): Rename bitmap_bit_p, normalizing parameter
	type. Update callers to match.
	(SET_BIT): Rename bitmap_set_bit, normalizing parameter type. Update
	callers to match.
	(SET_BIT_WITH_POPCOUNT): Rename bitmap_set_bit_with_popcount,
	normalizing parameter type. Update callers to match.
	(RESET_BIT): Rename bitmap_clear_bit, normalizing parameter type.
	Update callers to match.
	(RESET_BIT_WITH_POPCOUNT): Rename bitmap_clear_bit_with_popcount,
	normalizing parameter type. Update callers to match.
	* basic-block.h (sbitmap_intersection_of_succs): Rename
	bitmap_intersection_of_succs. Update callers to match.
	* basic-block.h (sbitmap_intersection_of_preds): Rename
	bitmap_intersection_of_preds. Update callers to match.
	* basic-block.h (sbitmap_union_of_succs): Rename
	bitmap_union_of_succs. Update callers to match.
	* basic-block.h (sbitmap_union_of_preds): Rename
	bitmap_union_of_preds. Update callers to match.

From-SVN: r193066

1 files changed, 10 insertions, 10 deletions

diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index a778be5..9056243 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -3551,25 +3551,25 @@ remove_unreachable_handlers (void)
 	  /* Negative LP numbers are MUST_NOT_THROW regions which
 	     are not considered BB enders.  */
 	  if (lp_nr < 0)
-	    SET_BIT (r_reachable, -lp_nr);
+	    bitmap_set_bit (r_reachable, -lp_nr);
 
 	  /* Positive LP numbers are real landing pads, are are BB enders.  */
 	  else if (lp_nr > 0)
 	    {
 	      gcc_assert (gsi_one_before_end_p (gsi));
 	      region = get_eh_region_from_lp_number (lp_nr);
-	      SET_BIT (r_reachable, region->index);
-	      SET_BIT (lp_reachable, lp_nr);
+	      bitmap_set_bit (r_reachable, region->index);
+	      bitmap_set_bit (lp_reachable, lp_nr);
 	    }
 
 	  /* Avoid removing regions referenced from RESX/EH_DISPATCH.  */
 	  switch (gimple_code (stmt))
 	    {
 	    case GIMPLE_RESX:
-	      SET_BIT (r_reachable, gimple_resx_region (stmt));
+	      bitmap_set_bit (r_reachable, gimple_resx_region (stmt));
 	      break;
 	    case GIMPLE_EH_DISPATCH:
-	      SET_BIT (r_reachable, gimple_eh_dispatch_region (stmt));
+	      bitmap_set_bit (r_reachable, gimple_eh_dispatch_region (stmt));
 	      break;
 	    default:
 	      break;
@@ -3589,7 +3589,7 @@ remove_unreachable_handlers (void)
 
   for (r_nr = 1;
        VEC_iterate (eh_region, cfun->eh->region_array, r_nr, region); ++r_nr)
-    if (region && !TEST_BIT (r_reachable, r_nr))
+    if (region && !bitmap_bit_p (r_reachable, r_nr))
       {
 	if (dump_file)
 	  fprintf (dump_file, "Removing unreachable region %d\n", r_nr);
@@ -3598,7 +3598,7 @@ remove_unreachable_handlers (void)
 
   for (lp_nr = 1;
        VEC_iterate (eh_landing_pad, cfun->eh->lp_array, lp_nr, lp); ++lp_nr)
-    if (lp && !TEST_BIT (lp_reachable, lp_nr))
+    if (lp && !bitmap_bit_p (lp_reachable, lp_nr))
       {
 	if (dump_file)
 	  fprintf (dump_file, "Removing unreachable landing pad %d\n", lp_nr);
@@ -3666,10 +3666,10 @@ remove_unreachable_handlers_no_lp (void)
 	switch (gimple_code (stmt))
 	  {
 	  case GIMPLE_RESX:
-	    SET_BIT (r_reachable, gimple_resx_region (stmt));
+	    bitmap_set_bit (r_reachable, gimple_resx_region (stmt));
 	    break;
 	  case GIMPLE_EH_DISPATCH:
-	    SET_BIT (r_reachable, gimple_eh_dispatch_region (stmt));
+	    bitmap_set_bit (r_reachable, gimple_eh_dispatch_region (stmt));
 	    break;
 	  default:
 	    break;
@@ -3678,7 +3678,7 @@ remove_unreachable_handlers_no_lp (void)
 
   for (i = 1; VEC_iterate (eh_region, cfun->eh->region_array, i, r); ++i)
     if (r && r->landing_pads == NULL && r->type != ERT_MUST_NOT_THROW
-	&& !TEST_BIT (r_reachable, i))
+	&& !bitmap_bit_p (r_reachable, i))
       {
 	if (dump_file)
 	  fprintf (dump_file, "Removing unreachable region %d\n", i);