(record_biv): Clear total_benefit field of new iv_class.

(get_condition): Verify op 2 of source is label_ref before looking within.

From-SVN: r2566

diff --git a/gcc/loop.c b/gcc/loop.c
index 232b88290d1fd05eed00d15d3fd4f1b4e51dea17..6ffa6bced187ddcec02930e4aaa202e29f0b0a00 100644 (file)
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -4122,6 +4122,7 @@ record_biv (v, insn, dest_reg, inc_val, mult_val,
       bl->eliminable = 0;
       bl->nonneg = 0;
       bl->reversed = 0;
+      bl->total_benefit = 0;
 
       /* Add this class to loop_iv_list.  */
       bl->next = loop_iv_list;
@@ -6255,7 +6256,8 @@ get_condition (jump, earliest)
 
   /* If this branches to JUMP_LABEL when the condition is false, reverse
      the condition.  */
-  if (XEXP (XEXP (SET_SRC (PATTERN (jump)), 2), 0) == JUMP_LABEL (jump))
+  if (GET_CODE (XEXP (SET_SRC (PATTERN (jump)), 2)) == LABEL_REF
+      && XEXP (XEXP (SET_SRC (PATTERN (jump)), 2), 0) == JUMP_LABEL (jump))
     code = reverse_condition (code), did_reverse_condition ^= 1;
 
   /* If we are comparing a register with zero, see if the register is set