gcse.c (update_ld_motion_stores): Don't use variable I for an insn.

	* gcse.c (update_ld_motion_stores): Don't use variable I for an insn.
	* flow.c (set_block_for_new_insns): Remove needless cast and
	properly check for unset block number.

From-SVN: r41227

gcc/ChangeLog

+Tue Apr 10 17:45:50 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
+
+	* gcse.c (update_ld_motion_stores): Don't use variable I for an insn.
+	* flow.c (set_block_for_new_insns): Remove needless cast and
+	properly check for unset block number.
+
 2001-04-10  Andrew MacLeod  <amacleod@redhat.com>
 
 	* function.c (purge_single_hard_subreg_set): Only check REGNO if 

gcc/flow.c

@@ -6723,8 +6723,8 @@ set_block_for_new_insns (insn, bb)
     {
       if (GET_CODE (insn) == NOTE)
 	break;
-      if ((size_t)INSN_UID (insn) >= basic_block_for_insn->num_elements 
-	  || BLOCK_NUM (insn) == 0)
+      if (INSN_UID (insn) >= basic_block_for_insn->num_elements 
+	  || BLOCK_FOR_INSN (insn) == 0)
 	set_block_for_insn (insn, bb);
       else
 	break;

gcc/gcse.c

@@ -6357,7 +6357,7 @@ update_ld_motion_stores (expr)
 	  rtx pat = PATTERN (insn);
 	  rtx src = SET_SRC (pat);
 	  rtx reg = expr->reaching_reg;
-	  rtx copy, i;
+	  rtx copy, new;
 
 	  /* If we've already copied it, continue.  */
 	  if (expr->reaching_reg == src)
@@ -6373,9 +6373,9 @@ update_ld_motion_stores (expr)
 	    }
 	  
 	  copy = gen_move_insn ( reg, SET_SRC (pat));
-	  i = emit_insn_before (copy, insn);
-	  record_one_set (REGNO (reg), i);
-	  set_block_for_new_insns (i, BLOCK_FOR_INSN (insn));
+	  new = emit_insn_before (copy, insn);
+	  record_one_set (REGNO (reg), new);
+	  set_block_for_new_insns (new, BLOCK_FOR_INSN (insn));
 	  SET_SRC (pat) = reg;
 
 	  /* un-recognize this pattern since it's probably different now.  */