From 795693c185eddff2b83be4b194da5e016f0717b0 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 22 Oct 2014 12:02:39 +0000 Subject: [PATCH] recog.h (recog_data_d): Remove enabled_alternatives. gcc/ * recog.h (recog_data_d): Remove enabled_alternatives. * recog.c (extract_insn): Don't set it. * reload.c (find_reloads): Call get_enabled_alternatives. From-SVN: r216556 --- gcc/ChangeLog | 6 ++++++ gcc/recog.c | 2 -- gcc/recog.h | 6 ------ gcc/reload.c | 3 ++- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 107afeea416..6b23954b5e7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-10-22 Richard Sandiford + + * recog.h (recog_data_d): Remove enabled_alternatives. + * recog.c (extract_insn): Don't set it. + * reload.c (find_reloads): Call get_enabled_alternatives. + 2014-10-22 Richard Sandiford * recog.h (constrain_operands): Add an alternative_mask parameter. diff --git a/gcc/recog.c b/gcc/recog.c index 5be01ccca95..1a17510b1d0 100644 --- a/gcc/recog.c +++ b/gcc/recog.c @@ -2344,8 +2344,6 @@ extract_insn (rtx_insn *insn) gcc_assert (recog_data.n_alternatives <= MAX_RECOG_ALTERNATIVES); - recog_data.enabled_alternatives = get_enabled_alternatives (insn); - recog_data.insn = NULL; which_alternative = -1; } diff --git a/gcc/recog.h b/gcc/recog.h index c91f661ad56..0802640689a 100644 --- a/gcc/recog.h +++ b/gcc/recog.h @@ -250,12 +250,6 @@ struct recog_data_d /* True if insn is ASM_OPERANDS. */ bool is_asm; - /* Specifies whether an insn alternative is enabled using the `enabled' - attribute in the insn pattern definition. For back ends not using - the `enabled' attribute the bits are always set to 1 in expand_insn. - Bits beyond the last alternative are also set to 1. */ - alternative_mask enabled_alternatives; - /* In case we are caching, hold insn data was generated for. */ rtx insn; }; diff --git a/gcc/reload.c b/gcc/reload.c index b8da67db3a2..5f560a941d3 100644 --- a/gcc/reload.c +++ b/gcc/reload.c @@ -3002,13 +3002,14 @@ find_reloads (rtx_insn *insn, int replace, int ind_levels, int live_known, First loop over alternatives. */ + alternative_mask enabled = get_enabled_alternatives (insn); for (this_alternative_number = 0; this_alternative_number < n_alternatives; this_alternative_number++) { int swapped; - if (!TEST_BIT (recog_data.enabled_alternatives, this_alternative_number)) + if (!TEST_BIT (enabled, this_alternative_number)) { int i; -- 2.30.2