s390.c (s390_z10_optimize_cmp): Use next/prev_active_insn to skip DEBUG_INSNs as...

2009-10-19  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* config/s390/s390.c (s390_z10_optimize_cmp): Use
	next/prev_active_insn to skip DEBUG_INSNs as well.

From-SVN: r152978

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 19b0169c62541e39262bdfa3b82ae7122149c38e..87ccb792d568043816c9f58ce657a634c1a6e4e9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-19  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * config/s390/s390.c (s390_z10_optimize_cmp): Use
+       next/prev_active_insn to skip DEBUG_INSNs as well.
+
 2009-10-19  Joseph Myers  <joseph@codesourcery.com>
 
        * config/arm/arm.c (output_move_neon): Use DImode in call to

diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index f9f2662e55aa17a0ee9e658dd24baf0d4fa237e0..c13170d25ca2e84c9464d06cc7c0ae9fc8ebd4cf 100644 (file)
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -9866,7 +9866,7 @@ s390_z10_optimize_cmp (rtx insn)
 
   /* Swap the COMPARE arguments and its mask if there is a
      conflicting access in the previous insn.  */
-  prev_insn = prev_nonnote_insn (insn);
+  prev_insn = prev_active_insn (insn);
   if (prev_insn != NULL_RTX && INSN_P (prev_insn)
       && reg_referenced_p (*op1, PATTERN (prev_insn)))
     s390_swap_cmp (cond, op0, op1, insn);
@@ -9877,7 +9877,7 @@ s390_z10_optimize_cmp (rtx insn)
      the operands, or if swapping them would cause a conflict
      with the previous insn, issue a NOP after the COMPARE in
      order to separate the two instuctions.  */
-  next_insn = next_nonnote_insn (insn);
+  next_insn = next_active_insn (insn);
   if (next_insn != NULL_RTX && INSN_P (next_insn)
       && s390_non_addr_reg_read_p (*op1, next_insn))
     {