[PATCH 24/50] fwprop.c:varying_mem_p

[Richard Sandiford]

gcc/
        * fwprop.c: Include rtl-iter.h.
        (varying_mem_p): Turn from being a for_each_rtx callback to being
        a function that examines each subrtx itself.
        (propagate_rtx): Update accordingly.

Index: gcc/fwprop.c
===================================================================
--- gcc/fwprop.c        2014-08-03 11:25:09.992954973 +0100
+++ gcc/fwprop.c        2014-08-03 11:25:26.890122028 +0100
@@ -38,6 +38,7 @@ Software Foundation; either version 3, o
 #include "tree-pass.h"
 #include "domwalk.h"
 #include "emit-rtl.h"
+#include "rtl-iter.h"
 
 
 /* This pass does simple forward propagation and simplification when an
@@ -623,14 +624,16 @@ propagate_rtx_1 (rtx *px, rtx old_rtx, r
 }
 
 
-/* for_each_rtx traversal function that returns 1 if BODY points to
-   a non-constant mem.  */
+/* Return true if X constains a non-constant mem.  */
 
-static int
-varying_mem_p (rtx *body, void *data ATTRIBUTE_UNUSED)
+static bool
+varying_mem_p (const_rtx x)
 {
-  rtx x = *body;
-  return MEM_P (x) && !MEM_READONLY_P (x);
+  subrtx_iterator::array_type array;
+  FOR_EACH_SUBRTX (iter, array, x, NONCONST)
+    if (MEM_P (*iter) && !MEM_READONLY_P (*iter))
+      return true;
+  return false;
 }
 
 
@@ -661,7 +664,7 @@ propagate_rtx (rtx x, enum machine_mode
          && (GET_MODE_SIZE (mode)
              <= GET_MODE_SIZE (GET_MODE (SUBREG_REG (new_rtx))))))
     flags |= PR_CAN_APPEAR;
-  if (!for_each_rtx (&new_rtx, varying_mem_p, NULL))
+  if (!varying_mem_p (new_rtx))
     flags |= PR_HANDLE_MEM;
 
   if (speed)