From 54bddf1d58d0ff4c2625a0310b8ff7853d73b871 Mon Sep 17 00:00:00 2001 From: Ilya Enkovich Date: Fri, 3 Oct 2014 08:43:21 +0000 Subject: [PATCH] lra-constraints.c (inherit_in_ebb): Handle calls with multiple return values. gcc/ * lra-constraints.c (inherit_in_ebb): Handle calls with multiple return values. * caller-save.c (save_call_clobbered_regs): Likewise. From-SVN: r215839 --- gcc/ChangeLog | 6 ++++++ gcc/caller-save.c | 9 +++++++-- gcc/lra-constraints.c | 25 +++++++++++++++---------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4a7366d4e90..884495f4ab2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-10-03 Ilya Enkovich + + * lra-constraints.c (inherit_in_ebb): Handle calls with + multiple return values. + * caller-save.c (save_call_clobbered_regs): Likewise. + 2014-10-03 Jakub Jelinek * tree-vect-data-refs.c (vect_permute_load_chain, diff --git a/gcc/caller-save.c b/gcc/caller-save.c index 11df2ecc171..e28facba7be 100644 --- a/gcc/caller-save.c +++ b/gcc/caller-save.c @@ -879,8 +879,13 @@ save_call_clobbered_regs (void) if (GET_CODE (pat) == PARALLEL) pat = XVECEXP (pat, 0, 0); dest = SET_DEST (pat); - newpat = gen_rtx_SET (VOIDmode, cheap, copy_rtx (dest)); - chain = insert_one_insn (chain, 0, -1, newpat); + /* For multiple return values dest is PARALLEL. + Currently we handle only single return value case. */ + if (REG_P (dest)) + { + newpat = gen_rtx_SET (VOIDmode, cheap, copy_rtx (dest)); + chain = insert_one_insn (chain, 0, -1, newpat); + } } } last = chain; diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c index 5f6839968d6..f1642f3b390 100644 --- a/gcc/lra-constraints.c +++ b/gcc/lra-constraints.c @@ -5348,16 +5348,21 @@ inherit_in_ebb (rtx_insn *head, rtx_insn *tail) if (GET_CODE (pat) == PARALLEL) pat = XVECEXP (pat, 0, 0); dest = SET_DEST (pat); - start_sequence (); - emit_move_insn (cheap, copy_rtx (dest)); - restore = get_insns (); - end_sequence (); - lra_process_new_insns (curr_insn, NULL, restore, - "Inserting call parameter restore"); - /* We don't need to save/restore of the pseudo from - this call. */ - usage_insns[regno].calls_num = calls_num; - bitmap_set_bit (&check_only_regs, regno); + /* For multiple return values dest is PARALLEL. + Currently we handle only single return value case. */ + if (REG_P (dest)) + { + start_sequence (); + emit_move_insn (cheap, copy_rtx (dest)); + restore = get_insns (); + end_sequence (); + lra_process_new_insns (curr_insn, NULL, restore, + "Inserting call parameter restore"); + /* We don't need to save/restore of the pseudo from + this call. */ + usage_insns[regno].calls_num = calls_num; + bitmap_set_bit (&check_only_regs, regno); + } } } to_inherit_num = 0; -- 2.30.2