1 files changed, 7 insertions, 19 deletions
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index 1ef29ce..10da800 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -230,7 +230,7 @@ void
 compute_global_livein (bitmap livein, bitmap def_blocks)
 {
   basic_block bb, *worklist, *tos;
-  int i;
+  unsigned i;
   bitmap_iterator bi;
 
   tos = worklist
@@ -603,7 +603,7 @@ void insert_phi_nodes_1 (tree var, bitmap *dfs, varray_type *work_stack)
 static void
 insert_phi_nodes (bitmap *dfs, bitmap names_to_rename)
 {
-  size_t i;
+  unsigned i;
   varray_type work_stack;
   bitmap_iterator bi;
 
@@ -1005,7 +1005,7 @@ insert_phi_nodes_for (tree var, bitmap *dfs, varray_type *work_stack)
 {
   struct def_blocks_d *def_map;
   bitmap phi_insertion_points;
-  int bb_index;
+  unsigned bb_index;
   edge e;
   tree phi;
   basic_block bb;
@@ -1036,7 +1036,7 @@ insert_phi_nodes_for (tree var, bitmap *dfs, varray_type *work_stack)
      We now always use fully pruned SSA form.  */
   while (VARRAY_ACTIVE_SIZE (*work_stack) > 0)
     {
-      int dfs_index;
+      unsigned dfs_index;
       bitmap_iterator bi;
 
       bb = VARRAY_TOP_GENERIC_PTR_NOGC (*work_stack);
@@ -1303,24 +1303,12 @@ debug_def_blocks (void)
 static int
 debug_def_blocks_r (void **slot, void *data ATTRIBUTE_UNUSED)
 {
-  unsigned long i;
   struct def_blocks_d *db_p = (struct def_blocks_d *) *slot;
-  bitmap_iterator bi;
   
   fprintf (stderr, "VAR: ");
   print_generic_expr (stderr, db_p->var, dump_flags);
-  fprintf (stderr, ", DEF_BLOCKS: { ");
-  EXECUTE_IF_SET_IN_BITMAP (db_p->def_blocks, 0, i, bi)
-    {
-      fprintf (stderr, "%ld ", i);
-    }
-  fprintf (stderr, "}");
-  fprintf (stderr, ", LIVEIN_BLOCKS: { ");
-  EXECUTE_IF_SET_IN_BITMAP (db_p->livein_blocks, 0, i, bi)
-    {
-      fprintf (stderr, "%ld ", i);
-    }
-  fprintf (stderr, "}\n");
+  bitmap_print (stderr, db_p->def_blocks, ", DEF_BLOCKS: { ", "}");
+  bitmap_print (stderr, db_p->livein_blocks, ", LIVEIN_BLOCKS: { ", "}\n");
 
   return 1;
 }
@@ -1382,7 +1370,7 @@ get_def_blocks_for (tree var)
 static void
 invalidate_name_tags (bitmap vars_to_rename)
 {
-  size_t i;
+  unsigned i;
   bool rename_name_tags_p;
   bitmap_iterator bi;