From 18c8f1a812865bbd0f07b29910c54ab8c0632c54 Mon Sep 17 00:00:00 2001 From: Vladimir Makarov Date: Fri, 4 Dec 2015 19:23:21 +0000 Subject: [PATCH] re PR rtl-optimization/68349 (ice in decompose_normal_address with -O2 at rtlanal.c:6086) 2015-12-04 Vladimir Makarov PR rtl-optimization/68349 * lra-eliminations.c (move_plus_up): New function. (lra_eliminate_regs_1): Use the function. 2015-12-04 Vladimir Makarov PR rtl-optimization/68349 * gcc.target/i386/pr68349.c: New test. From-SVN: r231300 --- gcc/ChangeLog | 6 +++++ gcc/lra-eliminations.c | 25 +++++++++++++++++++++ gcc/testsuite/ChangeLog | 6 ++++- gcc/testsuite/gcc.target/i386/pr68349.c | 30 +++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr68349.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 96e0c46f9e7..81eb73fb893 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-12-04 Vladimir Makarov + + PR rtl-optimization/68349 + * lra-eliminations.c (move_plus_up): New function. + (lra_eliminate_regs_1): Use the function. + 2015-12-04 Nathan Sidwell * config/nvptx/nvptx.c (nvptx_assemble_decl_begin): New, diff --git a/gcc/lra-eliminations.c b/gcc/lra-eliminations.c index 38b1fbb2aab..c639d364fa1 100644 --- a/gcc/lra-eliminations.c +++ b/gcc/lra-eliminations.c @@ -279,6 +279,29 @@ get_elimination (rtx reg) return &self_elim_table; } +/* Transform (subreg (plus reg const)) to (plus (subreg reg) const) + when it is possible. Return X or the transformation result if the + transformation is done. */ +static rtx +move_plus_up (rtx x) +{ + rtx subreg_reg; + enum machine_mode x_mode, subreg_reg_mode; + + if (GET_CODE (x) != SUBREG || !subreg_lowpart_p (x)) + return x; + subreg_reg = SUBREG_REG (x); + x_mode = GET_MODE (x); + subreg_reg_mode = GET_MODE (subreg_reg); + if (GET_CODE (x) == SUBREG && GET_CODE (subreg_reg) == PLUS + && GET_MODE_SIZE (x_mode) <= GET_MODE_SIZE (subreg_reg_mode) + && CONSTANT_P (XEXP (subreg_reg, 1))) + return gen_rtx_PLUS (x_mode, lowpart_subreg (x_mode, subreg_reg, + subreg_reg_mode), + XEXP (subreg_reg, 1)); + return x; +} + /* Scan X and replace any eliminable registers (such as fp) with a replacement (such as sp) if SUBST_P, plus an offset. The offset is a change in the offset between the eliminable register and its @@ -407,6 +430,8 @@ lra_eliminate_regs_1 (rtx_insn *insn, rtx x, machine_mode mem_mode, subst_p, update_p, update_sp_offset, full_p); + new0 = move_plus_up (new0); + new1 = move_plus_up (new1); if (new0 != XEXP (x, 0) || new1 != XEXP (x, 1)) return form_sum (new0, new1); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 40ae4fbf6a7..d5f0ce057a4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-12-04 Vladimir Makarov + + PR rtl-optimization/68349 + * gcc.target/i386/pr68349.c: New test. + 2015-12-04 Nathan Sidwell * gcc.target/nvptx/ary-init.c: New. @@ -288,7 +293,6 @@ * gfortran.dg/graphite/pr68550-1.f90: New. * gfortran.dg/graphite/pr68550-2.f90: New. ->>>>>>> .r231221 2015-12-02 Marek Polacek PR c/68513 diff --git a/gcc/testsuite/gcc.target/i386/pr68349.c b/gcc/testsuite/gcc.target/i386/pr68349.c new file mode 100644 index 00000000000..4eae0530f62 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr68349.c @@ -0,0 +1,30 @@ +/* PR target/68483 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +int a, b; +unsigned long strlen(); +typedef struct sHyphenNode { + char sepcnts[0]; + struct sHyphenNode *Daughters[]; +} * PHyphenNode; +int GetIndex(); +PHyphenNode c; +void DoHyphens_Field_1() { + char d[300], e[300]; + int z, f, l = strlen(); + for (; z;) + ; + for (; l; z++) { + f = z; + for (; f < l; f++) { + c = c->Daughters[GetIndex(d[f])]; + a = 0; + for (; a <= f - z; a++) + if (e[z + a]) + e[z] = c->sepcnts[a]; + } + } + if (e[z]) + b = 1; +} -- 2.30.2