From: Richard Sandiford <richard.sandiford@arm.com>
Date: Mon, 27 Oct 2014 18:40:51 +0000 (+0000)
Subject: alpha.c: Include rtl-iter.h.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=572e01c7f631d9abba9071a4f646fa043b6700ff;p=gcc.git

alpha.c: Include rtl-iter.h.

gcc/
	* config/alpha/alpha.c: Include rtl-iter.h.
	(split_small_symbolic_operand_1): Delete.
	(split_small_symbolic_operand): Use FOR_EACH_SUBRTX_PTR.

From-SVN: r216754
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 534542caaf0..4080aee2242 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-27  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* config/alpha/alpha.c: Include rtl-iter.h.
+	(split_small_symbolic_operand_1): Delete.
+	(split_small_symbolic_operand): Use FOR_EACH_SUBRTX_PTR.
+
 2014-10-27  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* config/s390/s390.c: Include rtl-iter.h.
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 1bead209be3..4d1263297eb 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -88,6 +88,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "opts.h"
 #include "params.h"
 #include "builtins.h"
+#include "rtl-iter.h"
 
 /* Specify which cpu to schedule for.  */
 enum processor_type alpha_tune;
@@ -1244,30 +1245,24 @@ some_small_symbolic_operand_int (rtx *px, void *data ATTRIBUTE_UNUSED)
   return small_symbolic_operand (x, Pmode) != 0;
 }
 
-static int
-split_small_symbolic_operand_1 (rtx *px, void *data ATTRIBUTE_UNUSED)
-{
-  rtx x = *px;
-
-  /* Don't re-split.  */
-  if (GET_CODE (x) == LO_SUM)
-    return -1;
-
-  if (small_symbolic_operand (x, Pmode))
-    {
-      x = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, x);
-      *px = x;
-      return -1;
-    }
-
-  return 0;
-}
-
 rtx
 split_small_symbolic_operand (rtx x)
 {
   x = copy_insn (x);
-  for_each_rtx (&x, split_small_symbolic_operand_1, NULL);
+  subrtx_ptr_iterator::array_type array;
+  FOR_EACH_SUBRTX_PTR (iter, array, &x, ALL)
+    {
+      rtx *ptr = *iter;
+      rtx x = *ptr;
+      /* Don't re-split.  */
+      if (GET_CODE (x) == LO_SUM)
+	iter.skip_subrtxes ();
+      else if (small_symbolic_operand (x, Pmode))
+	{
+	  *ptr = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, x);
+	  iter.skip_subrtxes ();
+	}
+    }
   return x;
 }