* struct-equiv.c (rtx_equiv_p): Fix POST_MODIFY case.

[pf3gnuchains/gcc-fork.git] / gcc / cfghooks.c

diff --git a/gcc/cfghooks.c b/gcc/cfghooks.c
index bc296d4..dbf259e 100644 (file)
--- a/gcc/cfghooks.c
+++ b/gcc/cfghooks.c
@@ -77,8 +77,8 @@ verify_flow_info (void)
   basic_block *last_visited;
 
   timevar_push (TV_CFG_VERIFY);
-  last_visited = xcalloc (last_basic_block + 2, sizeof (basic_block));
-  edge_checksum = xcalloc (last_basic_block + 2, sizeof (size_t));
+  last_visited = XCNEWVEC (basic_block, last_basic_block);
+  edge_checksum = XCNEWVEC (size_t, last_basic_block);
 
   /* Check bb chain & numbers.  */
   last_bb_seen = ENTRY_BLOCK_PTR;
@@ -122,7 +122,7 @@ verify_flow_info (void)
        }
       FOR_EACH_EDGE (e, ei, bb->succs)
        {
-         if (last_visited [e->dest->index + 2] == bb)
+         if (last_visited [e->dest->index] == bb)
            {
              error ("verify_flow_info: Duplicate edge %i->%i",
                     e->src->index, e->dest->index);
@@ -141,7 +141,7 @@ verify_flow_info (void)
              err = 1;
            }
 
-         last_visited [e->dest->index + 2] = bb;
+         last_visited [e->dest->index] = bb;
 
          if (e->flags & EDGE_FALLTHRU)
            n_fallthru++;
@@ -158,7 +158,7 @@ verify_flow_info (void)
              err = 1;
            }
 
-         edge_checksum[e->dest->index + 2] += (size_t) e;
+         edge_checksum[e->dest->index] += (size_t) e;
        }
       if (n_fallthru > 1)
        {
@@ -192,7 +192,7 @@ verify_flow_info (void)
              err = 1;
            }
 
-         edge_checksum[e->dest->index + 2] -= (size_t) e;
+         edge_checksum[e->dest->index] -= (size_t) e;
        }
     }
 
@@ -202,14 +202,14 @@ verify_flow_info (void)
     edge_iterator ei;
 
     FOR_EACH_EDGE (e, ei, ENTRY_BLOCK_PTR->succs)
-      edge_checksum[e->dest->index + 2] += (size_t) e;
+      edge_checksum[e->dest->index] += (size_t) e;
 
     FOR_EACH_EDGE (e, ei, EXIT_BLOCK_PTR->preds)
-      edge_checksum[e->dest->index + 2] -= (size_t) e;
+      edge_checksum[e->dest->index] -= (size_t) e;
   }
 
   FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR, NULL, next_bb)
-    if (edge_checksum[bb->index + 2])
+    if (edge_checksum[bb->index])
       {
        error ("basic block %i edge lists are corrupted", bb->index);
        err = 1;
@@ -691,10 +691,11 @@ can_duplicate_block_p (basic_block bb)
 }
 
 /* Duplicates basic block BB and redirects edge E to it.  Returns the
-   new basic block.  */
+   new basic block.  The new basic block is placed after the basic block
+   AFTER.  */
 
 basic_block
-duplicate_block (basic_block bb, edge e)
+duplicate_block (basic_block bb, edge e, basic_block after)
 {
   edge s, n;
   basic_block new_bb;
@@ -713,6 +714,8 @@ duplicate_block (basic_block bb, edge e)
 #endif
 
   new_bb = cfg_hooks->duplicate_block (bb);
+  if (after)
+    move_block_after (new_bb, after);
 
   new_bb->loop_depth = bb->loop_depth;
   new_bb->flags = bb->flags;