* jump.c (mark_jump_label): Tidy previous change.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42327 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c55d684..b5d739c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-19  Mark Mitchell  <mark@codesourcery.com>
+
+       * jump.c (mark_jump_label): Tidy previous change.
+
 2001-05-19  Bruce Korb  <bkorb@gnu.org>
 
        * fixinc/genfixes: no need for two warnings

diff --git a/gcc/jump.c b/gcc/jump.c
index d171cba..8f9c6b4 100644 (file)
--- 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