re PR middle-end/66314 (ice in verify_loop_structure)

2015-05-29  Richard Biener  <rguenther@suse.de>

	PR tree-optimization/66314
	* tree-ssa-threadupdate.c (create_block_for_threading): Add
	parameter that says which loop the new block belongs to.
	(ssa_create_duplicates): Blocks duplicated for the threaded
	path belong to the loop of the thread destination.

	* gcc.dg/asan/pr66314.c: New testcase.

From-SVN: r223861

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b41f330c2d01a5954d8ee0a7f8c82bef2874be34..a5941a68f352e1ca581ffe71d689be10ba592032 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-05-29  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/66314
+       * tree-ssa-threadupdate.c (create_block_for_threading): Add
+       parameter that says which loop the new block belongs to.
+       (ssa_create_duplicates): Blocks duplicated for the threaded
+       path belong to the loop of the thread destination.
+
 2015-05-29  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
 
        * config/arm/neon-testgen.ml (emit_epilogue): Remove manual call
@@ -8,7 +16,6 @@
        (cleanup-ipa-dump, cleanup-rtl-dump, cleanup-tree-dump,
        cleanup-saved-temps): Remove.
 
-
 2015-05-28  Andreas Tobler  <andreast@gcc.gnu.org>
 
        * configure.ac: Move the atoll check from AC_CHECK_FUNCS to

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0e9b14f3386035fd2fdccb8ab6f694b9a62d320d..a1485b3ace7e97f46115b3e3f56bedb9c3f28525 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-29  Richard Biener  <rguenther@suse.de>
+
+       PR tree-optimization/66314
+       * gcc.dg/asan/pr66314.c: New testcase.
+
 2015-05-29  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
 
        * lib/gcc-dg.exp (cleanup-ipa-dump, cleanup-rtl-dump,

diff --git a/gcc/testsuite/gcc.dg/asan/pr66314.c b/gcc/testsuite/gcc.dg/asan/pr66314.c
new file mode 100644 (file)
index 0000000..94dc2e8
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/asan/pr66314.c
@@ -0,0 +1,33 @@
+/* { dg-do compile } */
+/* { dg-options "-fprofile-arcs -fno-sanitize=address -fsanitize=kernel-address" } */
+
+char *a;
+int d;
+
+static int
+fn1 (int b, int c)
+{
+  while (a)
+    if (*a)
+      return -126;
+  if (b)
+    return -12;
+  if (c == -12)
+    return c;
+}
+
+void
+fn2 (int b, int c)
+{
+  for (;;)
+    {
+      d = fn1 (b, c);
+      switch (d)
+       {
+       case -126:
+       continue;
+       default:
+       return;
+       }
+    }
+}

diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index ce1dcdb96a7f6a8f1b0dce0bdd855a08936b35b1..a11b2c5e4c91a57071bb78b414244cb2b4352fcc 100644 (file)
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -312,13 +312,15 @@ remove_ctrl_stmt_and_useless_edges (basic_block bb, basic_block dest_bb)
 }
 
 /* Create a duplicate of BB.  Record the duplicate block in an array
-   indexed by COUNT stored in RD.  */
+   indexed by COUNT stored in RD.  LOOP is the loop the block should
+   belong to, if not NULL, in which case it will belong to the same
+   loop as BB.  */
 
 static void
 create_block_for_threading (basic_block bb,
                            struct redirection_data *rd,
                            unsigned int count,
-                           bitmap *duplicate_blocks)
+                           bitmap *duplicate_blocks, loop_p loop)
 {
   edge_iterator ei;
   edge e;
@@ -326,6 +328,11 @@ create_block_for_threading (basic_block bb,
   /* We can use the generic block duplication code and simply remove
      the stuff we do not need.  */
   rd->dup_blocks[count] = duplicate_block (bb, NULL, NULL);
+  if (loop && rd->dup_blocks[count]->loop_father != loop)
+    {
+      remove_bb_from_loops (rd->dup_blocks[count]);
+      add_bb_to_loop (rd->dup_blocks[count], loop);
+    }
 
   FOR_EACH_EDGE (e, ei, rd->dup_blocks[count]->succs)
     e->aux = NULL;
@@ -1303,6 +1310,10 @@ ssa_create_duplicates (struct redirection_data **slot,
                       ssa_local_info_t *local_info)
 {
   struct redirection_data *rd = *slot;
+  vec<jump_thread_edge *> *path = rd->path;
+
+  /* Check to which loop the threading destination belongs to.  */
+  loop_p dest_loop = (*path).last ()->e->dest->loop_father;
 
   /* The second duplicated block in a jump threading path is specific
      to the path.  So it gets stored in RD rather than in LOCAL_DATA.
@@ -1313,14 +1324,13 @@ ssa_create_duplicates (struct redirection_data **slot,
      Note the search starts with the third edge on the path.  The first
      edge is the incoming edge, the second edge always has its source
      duplicated.  Thus we start our search with the third edge.  */
-  vec<jump_thread_edge *> *path = rd->path;
   for (unsigned int i = 2; i < path->length (); i++)
     {
       if ((*path)[i]->type == EDGE_COPY_SRC_BLOCK
          || (*path)[i]->type == EDGE_COPY_SRC_JOINER_BLOCK)
        {
          create_block_for_threading ((*path)[i]->e->src, rd, 1,
-                                     &local_info->duplicate_blocks);
+                                     &local_info->duplicate_blocks, dest_loop);
          break;
        }
     }
@@ -1330,7 +1340,7 @@ ssa_create_duplicates (struct redirection_data **slot,
   if (local_info->template_block == NULL)
     {
       create_block_for_threading ((*path)[1]->e->src, rd, 0,
-                                 &local_info->duplicate_blocks);
+                                 &local_info->duplicate_blocks, dest_loop);
       local_info->template_block = rd->dup_blocks[0];
 
       /* We do not create any outgoing edges for the template.  We will
@@ -1340,7 +1350,7 @@ ssa_create_duplicates (struct redirection_data **slot,
   else
     {
       create_block_for_threading (local_info->template_block, rd, 0,
-                                 &local_info->duplicate_blocks);
+                                 &local_info->duplicate_blocks, dest_loop);
 
       /* Go ahead and wire up outgoing edges and update PHIs for the duplicate
         block.   */
@@ -1677,7 +1687,7 @@ thread_single_edge (edge e)
   npath->safe_push (x);
   rd.path = npath;
 
-  create_block_for_threading (bb, &rd, 0, NULL);
+  create_block_for_threading (bb, &rd, 0, NULL, NULL);
   remove_ctrl_stmt_and_useless_edges (rd.dup_blocks[0], NULL);
   create_edge_and_update_destination_phis (&rd, rd.dup_blocks[0], 0);