basic-block.h (reg_set_iterator): New.

	* basic-block.h (reg_set_iterator): New.
	(EXECUTE_IF_SET_IN_REG_SET): Make it iterator style.
	(EXECUTE_IF_AND_COMPL_IN_REG_SET): Likewise.
	(EXECUTE_IF_AND_IN_REG_SET): Likewise.
	* caller-save.c (save_call_clobbered_regs): Adjust to the new
	style.
	* cfgcleanup.c (thread_jump): Likewise.
	* cfgrtl.c (safe_insert_insn_on_edge): Likewise.
	* conflict.c (conflict_graph_compute): Likewise.
	* flow.c (verify_local_live_at_start, update_life_info,
	initialize_uninitialized_subregs, propagate_one_insn,
	init_propagate_block_info, free_propagate_block_info,
	propagate_block, dump_regset): Likewise.
	* global.c (global_conflicts): Likewise.
	* graph.c (start_bb): Likewise.
	* local-alloc.c (update_equiv_regs): Likewise.
	* loop.c (load_mems): Likewise.
	* reload1.c (compute_use_by_pseudos, order_regs_for_reload,
	find_reg, finish_spills): Likewise.
	* resource.c (mark_target_live_regs): Likewise.
	* sched-deps.c (sched_analyze_insn): Likewise.
	* sched-rgn.c (sched-rgn.c): Likewise.
	* config/frv/frv.c (frv_ifcvt_modify_tests): Likewise.

From-SVN: r89226

1 files changed, 9 insertions, 8 deletions

diff --git a/gcc/loop.c b/gcc/loop.c
index 0f62789..a573616 100644
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -11242,6 +11242,7 @@ load_mems (const struct loop *loop)
 	  rtx best = mem;
 	  int j;
 	  struct elt_loc_list *const_equiv = 0;
+	  reg_set_iterator rsi;
 
 	  if (e)
 	    {
@@ -11320,17 +11321,17 @@ load_mems (const struct loop *loop)
 	     data flow, and enables {basic,general}_induction_var to find
 	     more bivs/givs.  */
 	  EXECUTE_IF_SET_IN_REG_SET
-	    (&load_copies, FIRST_PSEUDO_REGISTER, j,
-	     {
-	       try_copy_prop (loop, reg, j);
-	     });
+	    (&load_copies, FIRST_PSEUDO_REGISTER, j, rsi)
+	    {
+	      try_copy_prop (loop, reg, j);
+	    }
 	  CLEAR_REG_SET (&load_copies);
 
 	  EXECUTE_IF_SET_IN_REG_SET
-	    (&store_copies, FIRST_PSEUDO_REGISTER, j,
-	     {
-	       try_swap_copy_prop (loop, reg, j);
-	     });
+	    (&store_copies, FIRST_PSEUDO_REGISTER, j, rsi)
+	    {
+	      try_swap_copy_prop (loop, reg, j);
+	    }
 	  CLEAR_REG_SET (&store_copies);
 	}
     }