tree-cfg.c (thread_jumps): Speed up by putting basic blocks into worklist instead...

	* tree-cfg.c (thread_jumps): Speed up by putting basic blocks
	into worklist instead of their indexes.

From-SVN: r89461

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0c5445f42bc3294f0198738b679439c12a7955e5..7a23a2d01049f3325a9f513a2311b887e209c274 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-22  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * tree-cfg.c (thread_jumps): Speed up by putting basic blocks
+       into worklist instead of their indexes.
+
 2004-10-22  Kazu Hirata  <kazu@cs.umass.edu>
 
        * alias.c, basic-block.h, cgraphunit.c, combine.c, domwalk.h,

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index d58bb13d9dd7dcd62c0ac2240234a3b47e1b13ba..0bf7b16b6b3d1a298a9891281d0d25675b27b0aa 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -3942,7 +3942,7 @@ thread_jumps (void)
 {
   basic_block bb;
   bool retval = false;
-  int *worklist = xmalloc (sizeof (int) * last_basic_block);
+  basic_block *worklist = xmalloc (sizeof (basic_block) * last_basic_block);
   unsigned int size = 0;
 
   FOR_EACH_BB (bb)
@@ -3951,11 +3951,11 @@ thread_jumps (void)
       bb->flags &= ~BB_VISITED;
     }
 
-  /* Initialize WORKLIST by putting the indexes of non-forwarder
-     blocks that immediately precede forwarder blocks because those
-     are the ones that we know we can thread jumps from.  We use
-     BB_VISITED to indicate that whether a given basic block is in
-     WORKLIST or not, thereby avoiding duplicates in WORKLIST.  */
+  /* Initialize WORKLIST by putting non-forwarder blocks that
+     immediately precede forwarder blocks because those are the ones
+     that we know we can thread jumps from.  We use BB_VISITED to
+     indicate whether a given basic block is in WORKLIST or not,
+     thereby avoiding duplicates in WORKLIST.  */
   FOR_EACH_BB (bb)
     {
       edge_iterator ei;
@@ -3981,7 +3981,7 @@ thread_jumps (void)
              && (e->src->flags & BB_VISITED) == 0)
            {
              e->src->flags |= BB_VISITED;
-             worklist[size] = e->src->index;
+             worklist[size] = e->src;
              size++;
            }
        }
@@ -3991,14 +3991,7 @@ thread_jumps (void)
   while (size > 0)
     {
       size--;
-      bb = BASIC_BLOCK (worklist[size]);
-
-      /* Check if BB is NULL because BB may have been deleted.  This
-        could happen if BB is originally a non-forwarder block, later
-        becomes a forwarder block, and it is deleted when a jump is
-        threaded through it.  */
-      if (!bb)
-       continue;
+      bb = worklist[size];
 
       /* BB->INDEX is not longer in WORKLIST, so clear BB_VISITED.  */
       bb->flags &= ~BB_VISITED;
@@ -4029,7 +4022,7 @@ thread_jumps (void)
                      && (f->src->flags & BB_VISITED) == 0)
                    {
                      f->src->flags |= BB_VISITED;
-                     worklist[size] = f->src->index;
+                     worklist[size] = f->src;
                      size++;
                    }
                }