aboutsummaryrefslogtreecommitdiff
path: root/gcc/ree.c
diff options
context:
space:
mode:
authorRichard Sandiford <richard.sandiford@arm.com>2014-10-22 12:02:26 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2014-10-22 12:02:26 +0000
commitdaca1a96afae35e1a2f39b91f014c2f414f70c5f (patch)
treeeee5382fbf8bb42300717bebf986a46d87ae8a9f /gcc/ree.c
parent9840b2fa87cc9657dca2b63dc66d37f94d2c9cb8 (diff)
downloadgcc-daca1a96afae35e1a2f39b91f014c2f414f70c5f.zip
gcc-daca1a96afae35e1a2f39b91f014c2f414f70c5f.tar.gz
gcc-daca1a96afae35e1a2f39b91f014c2f414f70c5f.tar.bz2
recog.h (constrain_operands): Add an alternative_mask parameter.
gcc/ * recog.h (constrain_operands): Add an alternative_mask parameter. (constrain_operands_cached): Likewise. (get_preferred_alternatives): Declare new form. * recog.c (get_preferred_alternatives): New bb-taking instance. (constrain_operands): Take the set of available alternatives as a parameter. (check_asm_operands, insn_invalid_p, extract_constrain_insn) (extract_constrain_insn_cached): Update calls to constrain_operands. * caller-save.c (reg_save_code): Likewise. * ira.c (setup_prohibited_mode_move_regs): Likewise. * postreload-gcse.c (eliminate_partially_redundant_load): Likewise. * ree.c (combine_reaching_defs): Likewise. * reload.c (can_reload_into): Likewise. * reload1.c (reload, reload_as_needed, inc_for_reload): Likewise. (gen_reload_chain_without_interm_reg_p, emit_input_reload_insns) (emit_insn_if_valid_for_reload): Likewise. * reorg.c (fill_slots_from_thread): Likewise. * config/i386/i386.c (ix86_attr_length_address_default): Likewise. * config/pa/pa.c (pa_can_combine_p): Likewise. * config/rl78/rl78.c (insn_ok_now): Likewise. * config/sh/sh.md (define_peephole2): Likewise. * final.c (final_scan_insn): Update call to constrain_operands_cached. From-SVN: r216555
Diffstat (limited to 'gcc/ree.c')
-rw-r--r--gcc/ree.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gcc/ree.c b/gcc/ree.c
index 1ccd88e..30a975c 100644
--- a/gcc/ree.c
+++ b/gcc/ree.c
@@ -767,7 +767,8 @@ combine_reaching_defs (ext_cand *cand, const_rtx set_pat, ext_state *state)
This is merely to keep the test for safety and updating the insn
stream simple. Also ensure that within the block the candidate
follows the defining insn. */
- if (BLOCK_FOR_INSN (cand->insn) != BLOCK_FOR_INSN (def_insn)
+ basic_block bb = BLOCK_FOR_INSN (cand->insn);
+ if (bb != BLOCK_FOR_INSN (def_insn)
|| DF_INSN_LUID (def_insn) > DF_INSN_LUID (cand->insn))
return false;
@@ -817,7 +818,7 @@ combine_reaching_defs (ext_cand *cand, const_rtx set_pat, ext_state *state)
if (recog_memoized (insn) == -1)
return false;
extract_insn (insn);
- if (!constrain_operands (1))
+ if (!constrain_operands (1, get_preferred_alternatives (insn, bb)))
return false;
}