From daca1a96afae35e1a2f39b91f014c2f414f70c5f Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 22 Oct 2014 12:02:26 +0000 Subject: 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 --- gcc/caller-save.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gcc/caller-save.c') diff --git a/gcc/caller-save.c b/gcc/caller-save.c index 53d312f5459..8d38eabf701 100644 --- a/gcc/caller-save.c +++ b/gcc/caller-save.c @@ -143,15 +143,17 @@ reg_save_code (int reg, enum machine_mode mode) cached_reg_restore_code[reg][mode] = recog_memoized (restinsn); /* Now extract both insns and see if we can meet their - constraints. */ + constraints. We don't know here whether the save and restore will + be in size- or speed-tuned code, so just use the set of enabled + alternatives. */ ok = (cached_reg_save_code[reg][mode] != -1 && cached_reg_restore_code[reg][mode] != -1); if (ok) { extract_insn (saveinsn); - ok = constrain_operands (1); + ok = constrain_operands (1, get_enabled_alternatives (saveinsn)); extract_insn (restinsn); - ok &= constrain_operands (1); + ok &= constrain_operands (1, get_enabled_alternatives (restinsn)); } if (! ok) -- cgit v1.2.3