diff options
| author | Segher Boessenkool <segher@kernel.crashing.org> | 2016-02-05 00:09:51 +0100 |
|---|---|---|
| committer | Segher Boessenkool <segher@gcc.gnu.org> | 2016-02-05 00:09:51 +0100 |
| commit | 171dc40edefb97b7bf15a7d4b4dbb9981e57987a (patch) | |
| tree | 0fdcad95e5f8873a1ee2cf85e01b7094f22cdd2e /gcc/combine.c | |
| parent | 618d6c1c4df3b6363de8564373578a73f605f27e (diff) | |
| download | gcc-171dc40edefb97b7bf15a7d4b4dbb9981e57987a.zip gcc-171dc40edefb97b7bf15a7d4b4dbb9981e57987a.tar.gz gcc-171dc40edefb97b7bf15a7d4b4dbb9981e57987a.tar.bz2 | |
combine: distribute_notes again (PR69567, PR64682)
As it happens the patch I did over a year ago for PR64682 isn't quite
correct. This is PR69567. This fixes it.
PR rtl-optimization/64682
PR rtl-optimization/69567
* combine.c (distribute_notes) <REG_DEAD>: Place the death note
before I2 only if the register is both used and set in I2.
From-SVN: r233159
Diffstat (limited to 'gcc/combine.c')
| -rw-r--r-- | gcc/combine.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gcc/combine.c b/gcc/combine.c index c307793..3609b94 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -13901,6 +13901,7 @@ distribute_notes (rtx notes, rtx_insn *from_insn, rtx_insn *i3, rtx_insn *i2, tem_insn = from_insn; else { + tem_insn = i3; if (from_insn && CALL_P (from_insn) && find_reg_fusage (from_insn, USE, XEXP (note, 0))) @@ -13909,7 +13910,14 @@ distribute_notes (rtx notes, rtx_insn *from_insn, rtx_insn *i3, rtx_insn *i2, place = i3; else if (i2 != 0 && next_nonnote_nondebug_insn (i2) == i3 && reg_referenced_p (XEXP (note, 0), PATTERN (i2))) - place = i2; + { + place = i2; + /* If the new I2 sets the same register that is marked dead + in the note, the note now should not be put on I2, as the + note refers to a previous incarnation of the reg. */ + if (reg_set_p (XEXP (note, 0), PATTERN (i2))) + tem_insn = i2; + } else if ((rtx_equal_p (XEXP (note, 0), elim_i2) && !(i2mod && reg_overlap_mentioned_p (XEXP (note, 0), @@ -13917,12 +13925,6 @@ distribute_notes (rtx notes, rtx_insn *from_insn, rtx_insn *i3, rtx_insn *i2, || rtx_equal_p (XEXP (note, 0), elim_i1) || rtx_equal_p (XEXP (note, 0), elim_i0)) break; - tem_insn = i3; - /* If the new I2 sets the same register that is marked dead - in the note, the note now should not be put on I2, as the - note refers to a previous incarnation of the reg. */ - if (i2 != 0 && reg_set_p (XEXP (note, 0), PATTERN (i2))) - tem_insn = i2; } if (place == 0) |