* bitmap.h (EXECUTE_IF_SET_IN_BITMAP, EXECUTE_IF_AND_COMPL_IN_BITMAP,

	EXECUTE_IF_AND_IN_BITMAP): Changed to iterator style.
	(bitmap_iterator): New type.
	(bmp_iter_common_next_1, bmp_iter_single_next_1, bmp_iter_single_init,
	bmp_iter_end_p, bmp_iter_single_next, bmp_iter_and_not_next_1,
	bmp_iter_and_not_init, bmp_iter_and_not_next, bmp_iter_and_next_1,
	bmp_iter_and_init, bmp_iter_and_next): New functions.
	* basic-block.h (EXECUTE_IF_SET_IN_REG_SET,
	EXECUTE_IF_AND_COMPL_IN_REG_SET, EXECUTE_IF_AND_IN_REG_SET): Changed to
	use iterator-style EXECUTE_IF_IN_BITMAP macros.
	* bitmap.c (bitmap_print): Ditto.
	* bt-load.c (clear_btr_from_live_range, add_btr_to_live_range,
	btr_def_live_range): Ditto.
	* cfganal.c (compute_dominance_frontiers_1) Ditto.
	* cgraphunit.c (convert_UIDs_in_bitmap, cgraph_characterize_statics):
	Ditto.
	* ddg.c (build_inter_loop_deps): Ditto.
	* df.c (FOR_EACH_BB_IN_BITMAP, df_bb_reg_info_compute, df_refs_update):
	Ditto.
	* except.c (remove_eh_handler): Ditto.
	* flow.c (reg_set_to_hard_reg_set): Ditto.
	* gcse.c (clear_modify_mem_tables): Ditto.
	* global.c (build_insn_chain): Ditto.
	* ifcvt.c (dead_or_predicable): Ditto.
	* loop-invariant.c (get_inv_cost, set_move_mark, move_invariant_reg):
	Ditto.
	* ra-build.c (livethrough_conflicts_bb, conflicts_between_webs): Ditto.
	* ra-rewrite.c (reloads_to_loads, rewrite_program2,
	detect_web_parts_to_rebuild, delete_useless_defs, actual_spill): Ditto.
	* tree-cfg.c (allocate_ssa_names, tree_duplicate_sese_region,
	tree_purge_all_dead_eh_edges): Ditto.
	* tree-into-ssa.c (compute_global_livein, insert_phi_nodes,
	insert_phi_nodes_for, debug_def_blocks_r, invalidate_name_tags,
	rewrite_ssa_into_ssa): Ditto.
	* tree-outof-ssa.c (find_replaceable_exprs): Ditto.
	* tree-sra.c (scan_function, decide_instantiations, scalarize_parms):
	Ditto.
	* tree-ssa-alias.c (init_alias_info, compute_points_to_and_addr_escape,
	compute_flow_sensitive_aliasing, maybe_create_global_var,
	dump_points_to_info_for): Ditto.
	* tree-ssa-dce.c (EXECUTE_IF_CONTROL_DEPENDENT): Ditto.
	* tree-ssa-dse.c (dse_finalize_block): Ditto.
	* tree-ssa-live.c (live_worklist, calculate_live_on_entry,
	calculate_live_on_exit, build_tree_conflict_graph, dump_live_info):
	Ditto.
	* tree-ssa-loop-ivopts.c (find_induction_variables,
	find_interesting_uses, add_old_ivs_candidates, alloc_use_cost_map,
	determine_use_iv_costs, determine_set_costs, find_best_candidate,
	set_cost_up_to, create_new_ivs, remove_unused_ivs, free_loop_data):
	Ditto.
	* tree-ssa-loop-manip.c (add_exit_phis_var, add_exit_phis): Ditto.
	* tree-ssa-operands.c (get_asm_expr_operands, add_call_clobber_ops,
	add_call_read_ops): Ditto.
	* tree-ssa-pre.c (bitmap_print_value_set, insert_aux): Ditto.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88145 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 44 insertions, 26 deletions

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 7da68540108..a5c42b4d16f 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -352,18 +352,20 @@ static void
 convert_UIDs_in_bitmap (bitmap in_ann, bitmap in_decl) 
 {
   int index;
-  EXECUTE_IF_SET_IN_BITMAP(in_decl, 0, index,
-      {
-	splay_tree_node n = 
-	  splay_tree_lookup (static_vars_to_consider_by_uid, index);
-	if (n != NULL) 
-	  {
-	    tree t = (tree)n->value;
-	    var_ann_t va = var_ann (t);
-	    if (va) 
-	      bitmap_set_bit(in_ann, va->uid);
-	  }
-      });
+  bitmap_iterator bi;
+
+  EXECUTE_IF_SET_IN_BITMAP(in_decl, 0, index, bi)
+    {
+      splay_tree_node n = 
+	      splay_tree_lookup (static_vars_to_consider_by_uid, index);
+      if (n != NULL) 
+	{
+	  tree t = (tree)n->value;
+	  var_ann_t va = var_ann (t);
+	  if (va) 
+	    bitmap_set_bit(in_ann, va->uid);
+	}
+    }
 }
 
 /* FIXME -- PROFILE-RESTRUCTURE: Delete all stmts initing *_decl_uid
@@ -2456,8 +2458,12 @@ cgraph_characterize_statics (void)
      (i.e. have there address taken).  */
   {
     int index;
-    EXECUTE_IF_SET_IN_BITMAP (module_statics_escape,
-			      0, index, clear_static_vars_maps (index));
+    bitmap_iterator bi;
+
+    EXECUTE_IF_SET_IN_BITMAP (module_statics_escape, 0, index, bi)
+      {
+	clear_static_vars_maps (index);
+      }
     bitmap_operation (all_module_statics, all_module_statics,
 		      module_statics_escape, BITMAP_AND_COMPL);
 
@@ -2484,6 +2490,8 @@ cgraph_characterize_statics (void)
 	{
 	  int index;
 	  local_static_vars_info_t l;
+	  bitmap_iterator bi;
+
 	  node = order[i];
 	  l = node->static_vars_info->local;
 	  fprintf (cgraph_dump_file, 
@@ -2491,14 +2499,18 @@ cgraph_characterize_statics (void)
 		   cgraph_node_name (node), node->uid);
 	  fprintf (cgraph_dump_file, "\n  locals read: ");
 	  EXECUTE_IF_SET_IN_BITMAP (l->statics_read_by_decl_uid,
-				    0, index,
-				    fprintf (cgraph_dump_file, "%s ",
-					     cgraph_get_static_name_by_uid (index)));
+				    0, index, bi)
+	    {
+	      fprintf (cgraph_dump_file, "%s ",
+		       cgraph_get_static_name_by_uid (index));
+	    }
 	  fprintf (cgraph_dump_file, "\n  locals written: ");
 	  EXECUTE_IF_SET_IN_BITMAP (l->statics_written_by_decl_uid,
-				    0, index,
-				    fprintf(cgraph_dump_file, "%s ",
-					   cgraph_get_static_name_by_uid (index)));
+				    0, index, bi)
+	    {
+	      fprintf(cgraph_dump_file, "%s ",
+		      cgraph_get_static_name_by_uid (index));
+	    }
 	}
     }
 
@@ -2597,6 +2609,8 @@ cgraph_characterize_statics (void)
 	  static_vars_info_t node_info;
 	  global_static_vars_info_t node_g;
 	  int index;
+	  bitmap_iterator bi;
+
 	  node = order[i];
 	  node_info = node->static_vars_info;
 	  node_g = node_info->global;
@@ -2612,14 +2626,18 @@ cgraph_characterize_statics (void)
 	    }
 	  fprintf (cgraph_dump_file, "\n  globals read: ");
 	  EXECUTE_IF_SET_IN_BITMAP (node_g->statics_read_by_decl_uid,
-				    0, index,
-				    fprintf (cgraph_dump_file, "%s ",
-					     cgraph_get_static_name_by_uid (index)));
+				    0, index, bi)
+	    {
+	      fprintf (cgraph_dump_file, "%s ",
+		       cgraph_get_static_name_by_uid (index));
+	    }
 	  fprintf (cgraph_dump_file, "\n  globals written: ");
 	  EXECUTE_IF_SET_IN_BITMAP (node_g->statics_written_by_decl_uid,
-				    0, index,
-				    fprintf (cgraph_dump_file, "%s ",
-					     cgraph_get_static_name_by_uid (index)));
+				    0, index, bi)
+	    {
+	      fprintf (cgraph_dump_file, "%s ",
+		       cgraph_get_static_name_by_uid (index));
+	    }
 	}
     }