tree-ssa-threadupdate.c (mark_threaded_blocks): Properly dispose of the jump thread...

       * tree-ssa-threadupdate.c (mark_threaded_blocks): Properly
        dispose of the jump thread path when the jump threading
        opportunity is cancelled.

From-SVN: r223448

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fe4dfc45e5cde67b12e0e8bf9fd43d00f6e3dbdf..27435c675c5393a8f3ecf19060de3d6bcd945f02 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-20  Jeff Law  <law@redhat.com>
+
+       * tree-ssa-threadupdate.c (mark_threaded_blocks): Properly
+       dispose of the jump thread path when the jump threading
+       opportunity is cancelled.
+
 2015-05-20  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
        * diagnostic.c (diagnostic_print_caret_line): Fix off-by-one error

diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c
index c5b78a4629af13eb076d46cc5f48f98b64630649..4bccad0156aabc7fbad36a253cf146800c5f84ab 100644 (file)
--- a/gcc/tree-ssa-threadupdate.c
+++ b/gcc/tree-ssa-threadupdate.c
@@ -2159,9 +2159,16 @@ mark_threaded_blocks (bitmap threaded_blocks)
         {
          /* Attach the path to the starting edge if none is yet recorded.  */
           if ((*path)[0]->e->aux == NULL)
-            (*path)[0]->e->aux = path;
-         else if (dump_file && (dump_flags & TDF_DETAILS))
-           dump_jump_thread_path (dump_file, *path, false);
+           {
+              (*path)[0]->e->aux = path;
+           }
+         else
+           {
+             paths.unordered_remove (i);
+             if (dump_file && (dump_flags & TDF_DETAILS))
+               dump_jump_thread_path (dump_file, *path, false);
+             delete_jump_thread_path (path);
+           }
         }
     }
   /* Second, look for paths that have any other jump thread attached to
@@ -2185,8 +2192,10 @@ mark_threaded_blocks (bitmap threaded_blocks)
          else
            {
              e->aux = NULL;
+             paths.unordered_remove (i);
              if (dump_file && (dump_flags & TDF_DETAILS))
                dump_jump_thread_path (dump_file, *path, false);
+             delete_jump_thread_path (path);
            }
        }
     }