diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-02 23:55:09 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-09-02 23:55:09 +0000 |
| commit | f439075a3c746acfbb963d53ac57a03174f530d1 (patch) | |
| tree | bdf6f59108893b04239fa020b9262e283a07cae7 /gcc | |
| parent | 7d3f6cc741ac8dfe562548a56c1e5109a2117800 (diff) | |
| download | ppe42-gcc-f439075a3c746acfbb963d53ac57a03174f530d1.tar.gz ppe42-gcc-f439075a3c746acfbb963d53ac57a03174f530d1.zip | |
* combine.c (distribute_notes): Don't add REG_LABEL to jump insn.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87002 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/combine.c | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b6e3cb29d88..758a33ac9b9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2004-09-02 Roman Zippel <zippel@linux-m68k.org> + + * combine.c (distribute_notes): Don't add REG_LABEL to jump insn. + 2004-09-02 Eric Christopher <echristo@redhat.com> * builtins.c (expand_builtin_cabs): Delete. diff --git a/gcc/combine.c b/gcc/combine.c index 4bd1555b1ed..be1a08c2d66 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -11839,21 +11839,25 @@ distribute_notes (rtx notes, rtx from_insn, rtx i3, rtx i2) place = i2; } - /* Don't attach REG_LABEL note to a JUMP_INSN which has - JUMP_LABEL already. Instead, decrement LABEL_NUSES. */ - if (place && JUMP_P (place) && JUMP_LABEL (place)) + /* Don't attach REG_LABEL note to a JUMP_INSN. Add + a JUMP_LABEL instead or decrement LABEL_NUSES. */ + if (place && JUMP_P (place)) { - if (JUMP_LABEL (place) != XEXP (note, 0)) + if (!JUMP_LABEL (place)) + JUMP_LABEL (place) = XEXP (note, 0); + else if (JUMP_LABEL (place) != XEXP (note, 0)) abort (); - if (LABEL_P (JUMP_LABEL (place))) + else if (LABEL_P (JUMP_LABEL (place))) LABEL_NUSES (JUMP_LABEL (place))--; place = 0; } - if (place2 && JUMP_P (place2) && JUMP_LABEL (place2)) + if (place2 && JUMP_P (place2)) { - if (JUMP_LABEL (place2) != XEXP (note, 0)) + if (!JUMP_LABEL (place2)) + JUMP_LABEL (place2) = XEXP (note, 0); + else if (JUMP_LABEL (place2) != XEXP (note, 0)) abort (); - if (LABEL_P (JUMP_LABEL (place2))) + else if (LABEL_P (JUMP_LABEL (place2))) LABEL_NUSES (JUMP_LABEL (place2))--; place2 = 0; } |
