diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2004-02-17 22:21:00 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gcc.gnu.org> | 2004-02-18 08:51:00 +1030 |
| commit | 8051c2eb7a942d45736aa566419a9fec8ee96a27 (patch) | |
| tree | 03e1c405e9d2d3e88aa509118732d9a60fa77386 | |
| parent | db33236e403545fe17a58c2c6b9e854b6da232ec (diff) | |
| download | gcc-8051c2eb7a942d45736aa566419a9fec8ee96a27.zip gcc-8051c2eb7a942d45736aa566419a9fec8ee96a27.tar.gz gcc-8051c2eb7a942d45736aa566419a9fec8ee96a27.tar.bz2 | |
re PR rtl-optimization/14119 (libjava Array_3 test fails at -O1)
PR optimization/14119
* combine.c (try_combine): When attemting to fix unrecognized insns,
don't delete SETs marked with REG_EH_REGION notes.
From-SVN: r77991
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/combine.c | 66 |
2 files changed, 42 insertions, 30 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 700cccd..0d3350a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-02-18 Alan Modra <amodra@bigpond.net.au> + + PR optimization/14119 + * combine.c (try_combine): When attemting to fix unrecognized insns, + don't delete SETs marked with REG_EH_REGION notes. + 2004-02-17 Ulrich Weigand <uweigand@de.ibm.com> * combine.c (simplify_if_then_else): Do not replace diff --git a/gcc/combine.c b/gcc/combine.c index 3cf8ae0..a1219de 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -2017,7 +2017,8 @@ try_combine (rtx i3, rtx i2, rtx i1, int *new_direct_jump_p) insn_code_number = recog_for_combine (&newpat, i3, &new_i3_notes); /* If the result isn't valid, see if it is a PARALLEL of two SETs where - the second SET's destination is a register that is unused. In that case, + the second SET's destination is a register that is unused and isn't + marked as an instruction that might trap in an EH region. In that case, we just need the first SET. This can occur when simplifying a divmod insn. We *must* test for this case here because the code below that splits two independent SETs doesn't handle this case correctly when it @@ -2033,37 +2034,42 @@ try_combine (rtx i3, rtx i2, rtx i1, int *new_direct_jump_p) { rtx set0 = XVECEXP (newpat, 0, 0); rtx set1 = XVECEXP (newpat, 0, 1); - + rtx note; + if (((GET_CODE (SET_DEST (set1)) == REG - && find_reg_note (i3, REG_UNUSED, SET_DEST (set1))) - || (GET_CODE (SET_DEST (set1)) == SUBREG - && find_reg_note (i3, REG_UNUSED, SUBREG_REG (SET_DEST (set1))))) - && ! side_effects_p (SET_SRC (set1))) - { - newpat = set0; - insn_code_number = recog_for_combine (&newpat, i3, &new_i3_notes); - } - + && find_reg_note (i3, REG_UNUSED, SET_DEST (set1))) + || (GET_CODE (SET_DEST (set1)) == SUBREG + && find_reg_note (i3, REG_UNUSED, SUBREG_REG (SET_DEST (set1))))) + && (!(note = find_reg_note (i3, REG_EH_REGION, NULL_RTX)) + || INTVAL (XEXP (note, 0)) <= 0) + && ! side_effects_p (SET_SRC (set1))) + { + newpat = set0; + insn_code_number = recog_for_combine (&newpat, i3, &new_i3_notes); + } + else if (((GET_CODE (SET_DEST (set0)) == REG - && find_reg_note (i3, REG_UNUSED, SET_DEST (set0))) - || (GET_CODE (SET_DEST (set0)) == SUBREG - && find_reg_note (i3, REG_UNUSED, - SUBREG_REG (SET_DEST (set0))))) - && ! side_effects_p (SET_SRC (set0))) - { - newpat = set1; - insn_code_number = recog_for_combine (&newpat, i3, &new_i3_notes); - - if (insn_code_number >= 0) - { - /* If we will be able to accept this, we have made a - change to the destination of I3. This requires us to - do a few adjustments. */ - - PATTERN (i3) = newpat; - adjust_for_new_dest (i3); - } - } + && find_reg_note (i3, REG_UNUSED, SET_DEST (set0))) + || (GET_CODE (SET_DEST (set0)) == SUBREG + && find_reg_note (i3, REG_UNUSED, + SUBREG_REG (SET_DEST (set0))))) + && (!(note = find_reg_note (i3, REG_EH_REGION, NULL_RTX)) + || INTVAL (XEXP (note, 0)) <= 0) + && ! side_effects_p (SET_SRC (set0))) + { + newpat = set1; + insn_code_number = recog_for_combine (&newpat, i3, &new_i3_notes); + + if (insn_code_number >= 0) + { + /* If we will be able to accept this, we have made a + change to the destination of I3. This requires us to + do a few adjustments. */ + + PATTERN (i3) = newpat; + adjust_for_new_dest (i3); + } + } } /* If we were combining three insns and the result is a simple SET |