combine.c: Include rtl-iter.h.

gcc/
	* combine.c: Include rtl-iter.h.
	(unmentioned_reg_p_1): Delete.
	(unmentioned_reg_p): Use FOR_EACH_SUBRTX rather than for_each_rtx.
	Don't handle null rtxes.

From-SVN: r214623

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b5ea9b491fb980d23a704f3054b33e8fdf2316f1..8744af9d1b8be46eba5524c0741a9e152bd8d758 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-28  Richard Sandiford  <rdsandiford@googlemail.com>
+
+       * combine.c: Include rtl-iter.h.
+       (unmentioned_reg_p_1): Delete.
+       (unmentioned_reg_p): Use FOR_EACH_SUBRTX rather than for_each_rtx.
+       Don't handle null rtxes.
+
 2014-08-28  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * calls.c: Include rtl-iter.h.

diff --git a/gcc/combine.c b/gcc/combine.c
index 546762b028382099ca010f293bf090f1c9b88683..6172cb3524d6d9a5f8137985c749c1730ec6d522 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -106,6 +106,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "obstack.h"
 #include "statistics.h"
 #include "params.h"
+#include "rtl-iter.h"
 
 /* Number of attempts to combine instructions in this function.  */
 
@@ -469,7 +470,6 @@ static void distribute_notes (rtx, rtx_insn *, rtx_insn *, rtx_insn *, rtx, rtx,
 static void distribute_links (struct insn_link *);
 static void mark_used_regs_combine (rtx);
 static void record_promoted_value (rtx_insn *, rtx);
-static int unmentioned_reg_p_1 (rtx *, void *);
 static bool unmentioned_reg_p (rtx, rtx);
 static int record_truncated_value (rtx *, void *);
 static void record_truncated_values (rtx *, void *);
@@ -13845,23 +13845,6 @@ distribute_links (struct insn_link *links)
     }
 }
 \f
-/* Subroutine of unmentioned_reg_p and callback from for_each_rtx.
-   Check whether the expression pointer to by LOC is a register or
-   memory, and if so return 1 if it isn't mentioned in the rtx EXPR.
-   Otherwise return zero.  */
-
-static int
-unmentioned_reg_p_1 (rtx *loc, void *expr)
-{
-  rtx x = *loc;
-
-  if (x != NULL_RTX
-      && (REG_P (x) || MEM_P (x))
-      && ! reg_mentioned_p (x, (rtx) expr))
-    return 1;
-  return 0;
-}
-
 /* Check for any register or memory mentioned in EQUIV that is not
    mentioned in EXPR.  This is used to restrict EQUIV to "specializations"
    of EXPR where some registers may have been replaced by constants.  */
@@ -13869,7 +13852,15 @@ unmentioned_reg_p_1 (rtx *loc, void *expr)
 static bool
 unmentioned_reg_p (rtx equiv, rtx expr)
 {
-  return for_each_rtx (&equiv, unmentioned_reg_p_1, expr);
+  subrtx_iterator::array_type array;
+  FOR_EACH_SUBRTX (iter, array, equiv, NONCONST)
+    {
+      const_rtx x = *iter;
+      if ((REG_P (x) || MEM_P (x))
+         && !reg_mentioned_p (x, expr))
+       return true;
+    }
+  return false;
 }
 \f
 DEBUG_FUNCTION void