tree-ssa-threadupdate.c (create_block_for_threading): Do not call remove_ctrl_stmt_an...

	* tree-ssa-threadupdate.c (create_block_for_threading): Do not call
	remove_ctrl_stmt_and_useless_edges.
	(create_duplicates): Call remove_ctrl_stmt_and_useless_edges.
	(fixup_template_block, thread_single_edge): Likewise.
	(mark_threaded_blocks): Use THREAD_TARGET.

From-SVN: r173492

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index acd049f46038916ac552d600b84da639f90df1cc..22f103ed76dbbdfba7e9f0f4acb8a56460515a20 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-06  Jeff Law  <law@redhat.com>
+
+       * tree-ssa-threadupdate.c (create_block_for_threading): Do not call
+       remove_ctrl_stmt_and_useless_edges.
+       (create_duplicates): Call remove_ctrl_stmt_and_useless_edges.
+       (fixup_template_block, thread_single_edge): Likewise.
+       (mark_threaded_blocks): Use THREAD_TARGET.
+
 2011-05-06  Alan Modra  <amodra@gmail.com>
 
        PR target/48900

diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index 841b710d19bc8603bb4772a50b84561fef7e340e..c6e34051c9c6a6802e0a8ee51e81d4e8668cd6fa 100644 (file)
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -198,8 +198,7 @@ remove_ctrl_stmt_and_useless_edges (basic_block bb, basic_block dest_bb)
     }
 }
 
-/* Create a duplicate of BB which only reaches the destination of the edge
-   stored in RD.  Record the duplicate block in RD.  */
+/* Create a duplicate of BB.  Record the duplicate block in RD.  */
 
 static void
 create_block_for_threading (basic_block bb, struct redirection_data *rd)
@@ -217,14 +216,6 @@ create_block_for_threading (basic_block bb, struct redirection_data *rd)
   /* Zero out the profile, since the block is unreachable for now.  */
   rd->dup_block->frequency = 0;
   rd->dup_block->count = 0;
-
-  /* The call to duplicate_block will copy everything, including the
-     useless COND_EXPR or SWITCH_EXPR at the end of BB.  We just remove
-     the useless COND_EXPR or SWITCH_EXPR here rather than having a
-     specialized block copier.  We also remove all outgoing edges
-     from the duplicate block.  The appropriate edge will be created
-     later.  */
-  remove_ctrl_stmt_and_useless_edges (rd->dup_block, NULL);
 }
 
 /* Hashing and equality routines for our hash table.  */
@@ -375,6 +366,7 @@ create_duplicates (void **slot, void *data)
 
       /* Go ahead and wire up outgoing edges and update PHIs for the duplicate
          block.  */
+      remove_ctrl_stmt_and_useless_edges (rd->dup_block, NULL);
       create_edge_and_update_destination_phis (rd, rd->dup_block);
     }
 
@@ -396,6 +388,7 @@ fixup_template_block (void **slot, void *data)
      and halt the hash table traversal.  */
   if (rd->dup_block && rd->dup_block == local_info->template_block)
     {
+      remove_ctrl_stmt_and_useless_edges (rd->dup_block, NULL);
       create_edge_and_update_destination_phis (rd, rd->dup_block);
       return 0;
     }
@@ -646,6 +639,7 @@ thread_single_edge (edge e)
   rd.outgoing_edge = eto;
 
   create_block_for_threading (bb, &rd);
+  remove_ctrl_stmt_and_useless_edges (rd.dup_block, NULL);
   create_edge_and_update_destination_phis (&rd, rd.dup_block);
 
   if (dump_file && (dump_flags & TDF_DETAILS))
@@ -978,8 +972,8 @@ mark_threaded_blocks (bitmap threaded_blocks)
       edge e = VEC_index (edge, threaded_edges, i);
       edge *x = (edge *) XNEWVEC (edge, 1);
 
-      x[0] = VEC_index (edge, threaded_edges, i + 1);
       e->aux = x;
+      THREAD_TARGET (e) = VEC_index (edge, threaded_edges, i + 1);
       bitmap_set_bit (tmp, e->dest->index);
     }