From b54567e24cb7bbc74b3e084cf0b7964c378f6511 Mon Sep 17 00:00:00 2001 From: Roman Zippel Date: Thu, 2 Sep 2004 23:55:09 +0000 Subject: [PATCH] * combine.c (distribute_notes): Don't add REG_LABEL to jump insn. From-SVN: r87002 --- gcc/ChangeLog | 4 ++++ 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 + + * combine.c (distribute_notes): Don't add REG_LABEL to jump insn. + 2004-09-02 Eric Christopher * 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; } -- 2.30.2