diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/store-motion.c | 22 |
2 files changed, 15 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 95c7fb89..4a271d5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2014-08-28 Richard Sandiford <rdsandiford@googlemail.com> + * store-motion.c: Include rtl-iter.h. + (extract_mentioned_regs_1): Delete. + (extract_mentioned_regs): Use FOR_EACH_SUBRTX_VAR rather than + for_each_rtx to iterate over subrtxes. + +2014-08-28 Richard Sandiford <rdsandiford@googlemail.com> + * sel-sched.c: Include rtl-iter.h (count_occurrences_1): Delete. (count_occurrences_equiv): Turn rtxes into const_rtxes. diff --git a/gcc/store-motion.c b/gcc/store-motion.c index fdbc6b3..70adfa93 100644 --- a/gcc/store-motion.c +++ b/gcc/store-motion.c @@ -42,6 +42,7 @@ along with GCC; see the file COPYING3. If not see #include "hash-table.h" #include "df.h" #include "dbgcnt.h" +#include "rtl-iter.h" /* This pass implements downward store motion. As of May 1, 2009, the pass is not enabled by default on any target, @@ -278,19 +279,6 @@ store_ops_ok (const_rtx x, int *regs_set) return true; } -/* Helper for extract_mentioned_regs. */ - -static int -extract_mentioned_regs_1 (rtx *loc, void *data) -{ - rtx *mentioned_regs_p = (rtx *) data; - - if (REG_P (*loc)) - *mentioned_regs_p = alloc_EXPR_LIST (0, *loc, *mentioned_regs_p); - - return 0; -} - /* Returns a list of registers mentioned in X. FIXME: A regset would be prettier and less expensive. */ @@ -298,7 +286,13 @@ static rtx extract_mentioned_regs (rtx x) { rtx mentioned_regs = NULL; - for_each_rtx (&x, extract_mentioned_regs_1, &mentioned_regs); + subrtx_var_iterator::array_type array; + FOR_EACH_SUBRTX_VAR (iter, array, x, NONCONST) + { + rtx x = *iter; + if (REG_P (x)) + mentioned_regs = alloc_EXPR_LIST (0, x, mentioned_regs); + } return mentioned_regs; } |