re PR rtl-optimization/46571 (bootstrap comparison failure in fortran/trans-openmp.c)

PR rtl-optimization/46571
	* gcse.c (hash_scan_set): Use next_nonnote_nondebug_insn.
	(compute_hash_table_work): Use NONDEBUG_INSN_P.

From-SVN: r167008

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5a41aab697685c1d99c0994f046f7e0c5f66f615..86af167e25067c751066f461ef5781e4c5da7e87 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-21  Richard Henderson  <rth@redhat.com>
+
+       PR rtl-optimization/46571
+       * gcse.c (hash_scan_set): Use next_nonnote_nondebug_insn.
+       (compute_hash_table_work): Use NONDEBUG_INSN_P.
+
 2010-11-21  Eric Botcazou  <ebotcazou@adacore.com>
 
        * config/mips/mips.c (machine_function): Rename load_label_length to

diff --git a/gcc/gcse.c b/gcc/gcse.c
index 8e31ee11a589cfe5e39262ffd34db6f2064aa2b6..2cfed4b76a5d564e6d212e537ef743e1eeab77a8 100644 (file)
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -1383,7 +1383,7 @@ hash_scan_set (rtx pat, rtx insn, struct hash_table_d *table)
                  modified.  Here we want to search from INSN+1 on, but
                  oprs_available_p searches from INSN on.  */
               && (insn == BB_END (BLOCK_FOR_INSN (insn))
-                  || (tmp = next_nonnote_insn (insn)) == NULL_RTX
+                  || (tmp = next_nonnote_nondebug_insn (insn)) == NULL_RTX
                   || BLOCK_FOR_INSN (tmp) != BLOCK_FOR_INSN (insn)
                   || oprs_available_p (pat, tmp)))
        insert_set_in_table (pat, insn, table);
@@ -1670,7 +1670,7 @@ compute_hash_table_work (struct hash_table_d *table)
         determine when registers and memory are first and last set.  */
       FOR_BB_INSNS (current_bb, insn)
        {
-         if (! INSN_P (insn))
+         if (!NONDEBUG_INSN_P (insn))
            continue;
 
          if (CALL_P (insn))
@@ -1693,7 +1693,7 @@ compute_hash_table_work (struct hash_table_d *table)
 
       /* The next pass builds the hash table.  */
       FOR_BB_INSNS (current_bb, insn)
-       if (INSN_P (insn))
+       if (NONDEBUG_INSN_P (insn))
          hash_scan_insn (insn, table);
     }