From 878de307d62595211f10a0a88a9551215c14c898 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Sat, 19 May 2001 23:54:07 +0000 Subject: [PATCH] * jump.c (mark_jump_label): Tidy previous change. From-SVN: r42327 --- gcc/ChangeLog | 4 ++++ gcc/jump.c | 20 ++++++-------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c55d6840ea4..b5d739cce83 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2001-05-19 Mark Mitchell + + * jump.c (mark_jump_label): Tidy previous change. + 2001-05-19 Bruce Korb * fixinc/genfixes: no need for two warnings diff --git a/gcc/jump.c b/gcc/jump.c index d171cbae39d..8f9c6b45a36 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -2556,20 +2556,12 @@ mark_jump_label (x, insn, cross_jump, in_mem) /* We may also have a REG_EQUAL note to indicate that a register is being set to the address of the - label. We cannot use find_reg_note as above - because the REG_EQUAL note will use a LABEL_REF, - not the actual CODE_LABEL. */ - for (note = REG_NOTES (insn); note; note = XEXP (note, 1)) - if (REG_NOTE_KIND (note) == REG_EQUAL) - { - if (GET_CODE (XEXP (note, 0)) == LABEL_REF - && XEXP (XEXP (note, 0), 0) == olabel) - XEXP (XEXP (note, 0), 0) = label; - /* There is only one REG_EQUAL note per - instruction, so we are done at this - point. */ - break; - } + label. */ + note = find_reg_note (insn, REG_EQUAL, NULL_RTX); + if (note + && GET_CODE (XEXP (note, 0)) == LABEL_REF + && XEXP (XEXP (note, 0), 0) == olabel) + XEXP (XEXP (note, 0), 0) = label; } /* Otherwise, add a REG_LABEL note for LABEL unless there already -- 2.30.2