From 218823d74ed3928ed6a53f357c5fa9a793d74f00 Mon Sep 17 00:00:00 2001 From: Vladimir Makarov Date: Tue, 7 Apr 2015 15:01:07 +0000 Subject: [PATCH] re PR debug/65678 (internal compiler error: in gen_rtx_SUBREG, at emit-rtl.c:909) 2015-04-07 Vladimir Makarov PR target/65678 * lra-remat.c (do_remat): Process input and non-input insn registers separately. From-SVN: r221901 --- gcc/ChangeLog | 6 ++++++ gcc/lra-remat.c | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d4bf73ad9a7..9e9c7a94df6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-04-07 Vladimir Makarov + + PR target/65678 + * lra-remat.c (do_remat): Process input and non-input insn + registers separately. + 2015-04-07 Jakub Jelinek PR debug/65678 diff --git a/gcc/lra-remat.c b/gcc/lra-remat.c index 36ea79282de..a23cb5ba3e7 100644 --- a/gcc/lra-remat.c +++ b/gcc/lra-remat.c @@ -1234,22 +1234,25 @@ do_remat (void) for (i = 0; i < nregs; i++) CLEAR_HARD_REG_BIT (live_hard_regs, hard_regno + i); } - else if (reg->type != OP_IN - && find_regno_note (insn, REG_UNUSED, reg->regno) == NULL) + /* Process also hard regs (e.g. CC register) which are part + of insn definition. */ + for (reg = static_id->hard_regs; reg != NULL; reg = reg->next) + if (reg->type == OP_IN + && find_regno_note (insn, REG_DEAD, reg->regno) != NULL) + CLEAR_HARD_REG_BIT (live_hard_regs, reg->regno); + /* Inputs have been processed, now process outputs. */ + for (reg = id->regs; reg != NULL; reg = reg->next) + if (reg->type != OP_IN + && find_regno_note (insn, REG_UNUSED, reg->regno) == NULL) { if ((hard_regno = get_hard_regs (reg, nregs)) < 0) continue; for (i = 0; i < nregs; i++) SET_HARD_REG_BIT (live_hard_regs, hard_regno + i); } - /* Process also hard regs (e.g. CC register) which are part - of insn definition. */ for (reg = static_id->hard_regs; reg != NULL; reg = reg->next) - if (reg->type == OP_IN - && find_regno_note (insn, REG_DEAD, reg->regno) != NULL) - CLEAR_HARD_REG_BIT (live_hard_regs, reg->regno); - else if (reg->type != OP_IN - && find_regno_note (insn, REG_UNUSED, reg->regno) == NULL) + if (reg->type != OP_IN + && find_regno_note (insn, REG_UNUSED, reg->regno) == NULL) SET_HARD_REG_BIT (live_hard_regs, reg->regno); } } -- 2.30.2