tree-ssa-threadedge.c (thread_across_edge): Add missing return.

 	* tree-ssa-threadedge.c (thread_across_edge): Add missing return.

 	* gcc.dg/tree-ssa/ssa-dom-thread-4.c: New test.

From-SVN: r173206

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fd6200370984d7439dd72d6d1471826940c1638c..dd45a79ff820573c201e636ba41801bd269d3dd3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-29  Jeff Law  <law@redhat.com>
+
+       * tree-ssa-threadedge.c (thread_across_edge): Add missing return.
+
 2011-04-29  Martin Jambor  <mjambor@suse.cz>
 
        * cgraph.h (cgraph_postorder): Remove declaration.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 873e368c163190fda2546e240cfb7ecb100ea5ce..2ef4546808683e866b6da761f471f53d12fbb8bd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-29  Jeff Law <law@redhat.com>
+
+       * gcc.dg/tree-ssa/ssa-dom-thread-4.c: New test.
+
 2011-04-29  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/48606

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c
new file mode 100644 (file)
index 0000000..e841429
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-thread-4.c
@@ -0,0 +1,63 @@
+/* { dg-do compile } */ 
+/* { dg-options "-O2 -fdump-tree-dom1-details" } */
+struct bitmap_head_def;
+typedef struct bitmap_head_def *bitmap;
+typedef const struct bitmap_head_def *const_bitmap;
+typedef unsigned long BITMAP_WORD;
+typedef struct bitmap_element_def
+{
+  struct bitmap_element_def *next;
+  unsigned int indx;
+} bitmap_element;
+
+
+
+
+
+
+
+
+
+unsigned char
+bitmap_ior_and_compl (bitmap dst, const_bitmap a, const_bitmap b,
+                     const_bitmap kill)
+{
+  unsigned char changed = 0;
+
+  bitmap_element *dst_elt;
+  const bitmap_element *a_elt, *b_elt, *kill_elt, *dst_prev;
+
+  while (a_elt || b_elt)
+    {
+      unsigned char new_element = 0;
+
+      if (b_elt)
+       while (kill_elt && kill_elt->indx < b_elt->indx)
+         kill_elt = kill_elt->next;
+
+      if (b_elt && kill_elt && kill_elt->indx == b_elt->indx
+         && (!a_elt || a_elt->indx >= b_elt->indx))
+       {
+         bitmap_element tmp_elt;
+         unsigned ix;
+
+         BITMAP_WORD ior = 0;
+
+             changed = bitmap_elt_ior (dst, dst_elt, dst_prev,
+                                       a_elt, &tmp_elt, changed);
+
+       }
+
+    }
+
+
+  return changed;
+}
+/* The block starting the second conditional has  3 incoming edges,
+   we should thread all three, but due to a bug in the threading
+   code we missed the edge when the first conditional is false
+   (b_elt is zero, which means the second conditional is always
+   zero.  */
+/* { dg-final { scan-tree-dump-times "Threaded" 3 "dom1"} } */
+/* { dg-final { cleanup-tree-dump "dom1" } } */
+

diff --git a/gcc/tree-ssa-threadedge.c b/gcc/tree-ssa-threadedge.c
index 1fee9bf84c37bbdb1d79aada1e6b5fde61982337..24e63977c29da7aa8e7ed1e63d40607cbcd7d004 100644 (file)
--- a/gcc/tree-ssa-threadedge.c
+++ b/gcc/tree-ssa-threadedge.c
@@ -771,6 +771,7 @@ thread_across_edge (gimple dummy_cond,
 
          remove_temporary_equivalences (stack);
          register_jump_thread (e, taken_edge);
+         return;
        }
     }