From 40954ce58f2f7b526e462228c6a08106bc9d058e Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 28 Aug 2014 06:23:31 +0000 Subject: [PATCH] ira.c: Include rtl-iter.h. gcc/ * ira.c: Include rtl-iter.h. (set_paradoxical_subreg): Turn from being a for_each_rtx callback to being a function that examines each subrtx itself. Remove handling of null rtxes. (update_equiv_regs): Update call accordingly. From-SVN: r214642 --- gcc/ChangeLog | 8 ++++++++ gcc/ira.c | 33 +++++++++++++++------------------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 36b25cb1310..34472620f07 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-08-28 Richard Sandiford + + * ira.c: Include rtl-iter.h. + (set_paradoxical_subreg): Turn from being a for_each_rtx callback + to being a function that examines each subrtx itself. Remove + handling of null rtxes. + (update_equiv_regs): Update call accordingly. + 2014-08-28 Richard Sandiford * fwprop.c: Include rtl-iter.h. diff --git a/gcc/ira.c b/gcc/ira.c index 7c184961d91..d499d7de7b4 100644 --- a/gcc/ira.c +++ b/gcc/ira.c @@ -392,6 +392,7 @@ along with GCC; see the file COPYING3. If not see #include "lra.h" #include "dce.h" #include "dbgcnt.h" +#include "rtl-iter.h" struct target_ira default_target_ira; struct target_ira_int default_target_ira_int; @@ -3266,23 +3267,20 @@ no_equiv (rtx reg, const_rtx store ATTRIBUTE_UNUSED, /* Check whether the SUBREG is a paradoxical subreg and set the result in PDX_SUBREGS. */ -static int -set_paradoxical_subreg (rtx *subreg, void *pdx_subregs) +static void +set_paradoxical_subreg (rtx_insn *insn, bool *pdx_subregs) { - rtx reg; - - if ((*subreg) == NULL_RTX) - return 1; - if (GET_CODE (*subreg) != SUBREG) - return 0; - reg = SUBREG_REG (*subreg); - if (!REG_P (reg)) - return 0; - - if (paradoxical_subreg_p (*subreg)) - ((bool *)pdx_subregs)[REGNO (reg)] = true; - - return 0; + subrtx_iterator::array_type array; + FOR_EACH_SUBRTX (iter, array, PATTERN (insn), NONCONST) + { + const_rtx subreg = *iter; + if (GET_CODE (subreg) == SUBREG) + { + const_rtx reg = SUBREG_REG (subreg); + if (REG_P (reg) && paradoxical_subreg_p (subreg)) + pdx_subregs[REGNO (reg)] = true; + } + } } /* In DEBUG_INSN location adjust REGs from CLEARED_REGS bitmap to the @@ -3345,8 +3343,7 @@ update_equiv_regs (void) FOR_EACH_BB_FN (bb, cfun) FOR_BB_INSNS (bb, insn) if (NONDEBUG_INSN_P (insn)) - for_each_rtx_in_insn (&insn, set_paradoxical_subreg, - (void *) pdx_subregs); + set_paradoxical_subreg (insn, pdx_subregs); /* Scan the insns and find which registers have equivalences. Do this in a separate scan of the insns because (due to -fcse-follow-jumps)