re PR middle-end/11414 (Segementation fault compiling csets.adb)

	PR middle-end/11414
	* loop.c (load_mems): Use redirect_jump to forward jumps from
	the original loop end label to the new "loop sink" block's label.

From-SVN: r72876

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e29d3bca7d782a7a61a1962399fb8774ef933fe3..e414c23e4d56d3357fb96c5825111539055dc248 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-23  Roger Sayle  <roger@eyesopen.com>
+
+       PR middle-end/11414
+       * loop.c (load_mems): Use redirect_jump to forward jumps from
+       the original loop end label to the new "loop sink" block's label.
+
 2003-10-23  Roger Sayle  <roger@eyesopen.com>
 
        PR middle-end/12705

diff --git a/gcc/loop.c b/gcc/loop.c
index c5b40608142d433e6324ac4c85cbf96508e1d613..667833d64a51a917a16caae51b4dba8d506e214c 100644 (file)
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -10005,20 +10005,12 @@ load_mems (const struct loop *loop)
        }
     }
 
+  /* Now, we need to replace all references to the previous exit
+     label with the new one.  */
   if (label != NULL_RTX && end_label != NULL_RTX)
-    {
-      /* Now, we need to replace all references to the previous exit
-        label with the new one.  */
-      replace_label_data rr;
-      rr.r1 = end_label;
-      rr.r2 = label;
-      rr.update_label_nuses = true;
-
-      for (p = loop->start; p != loop->end; p = NEXT_INSN (p))
-       {
-         for_each_rtx (&p, replace_label, &rr);
-       }
-    }
+    for (p = loop->start; p != loop->end; p = NEXT_INSN (p))
+      if (GET_CODE (p) == JUMP_INSN && JUMP_LABEL (p) == end_label)
+       redirect_jump (p, label, false);
 
   cselib_finish ();
 }