re PR bootstrap/17761 (sh-elf doesn't build after merge from edge-vector-branch)

	PR bootstrap/17761
	* lcm.c (optimize_mode_switching): Update to use EDGE_SUCC and
	FOR_EACH_EDGE macros.

From-SVN: r88368

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bac245f32bc3b87b8ed5d88bdcdc8c2fa615e1a6..b91dbefa14eb237d33ee419084a5e9b1632b3df1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-30  Ben Elliston  <bje@au.ibm.com>
+
+       PR bootstrap/17761
+       * lcm.c (optimize_mode_switching): Update to use EDGE_SUCC and
+       FOR_EACH_EDGE macros.
+
 2004-09-30  Joseph S. Myers  <jsm@polyomino.org.uk>
 
        * c-tree.h (readonly_error): Remove.

diff --git a/gcc/lcm.c b/gcc/lcm.c
index c3e5f93313aae815239bdc473a8fc21dce5799bc..b568b06b99b56532a3338606d783cd857b35a415 100644 (file)
--- a/gcc/lcm.c
+++ b/gcc/lcm.c
@@ -1025,17 +1025,18 @@ optimize_mode_switching (FILE *file)
        exit block, so that we can note that there NORMAL_MODE is supplied /
        required.  */
     edge eg;
-    post_entry = split_edge (ENTRY_BLOCK_PTR->succ);
+    edge_iterator ei;
+    post_entry = split_edge (EDGE_SUCC (ENTRY_BLOCK_PTR, 0));
     /* The only non-call predecessor at this stage is a block with a
        fallthrough edge; there can be at most one, but there could be
        none at all, e.g. when exit is called.  */
-    for (pre_exit = 0, eg = EXIT_BLOCK_PTR->pred; eg; eg = eg->pred_next)
+    pre_exit = 0;
+    FOR_EACH_EDGE (eg, ei, EXIT_BLOCK_PTR->preds)
       if (eg->flags & EDGE_FALLTHRU)
        {
          regset live_at_end = eg->src->global_live_at_end;
 
-         if (pre_exit)
-           abort ();
+         gcc_assert (!pre_exit);
          pre_exit = split_edge (eg);
          COPY_REG_SET (pre_exit->global_live_at_start, live_at_end);
          COPY_REG_SET (pre_exit->global_live_at_end, live_at_end);