tree-optimization/106497 - more forward threader can-copy-bb

This adds EDGE_COPY_SRC_JOINER_BLOCK sources to the set of blocks
we need to check we can duplicate.

	PR tree-optimization/106497
	* tree-ssa-threadupdate.cc (fwd_jt_path_registry::update_cfg):
	Also verify we can copy EDGE_COPY_SRC_JOINER_BLOCK.

	* gcc.dg/torture/pr106497.c: New testcase.

diff --git a/gcc/testsuite/gcc.dg/torture/pr106497.c b/gcc/testsuite/gcc.dg/torture/pr106497.c
new file mode 100644 (file)
index 0000000..601200d
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr106497.c
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-fno-tree-dce" } */
+
+int n;
+
+__attribute__ ((pure,returns_twice)) int
+bar (void);
+
+int
+foo (int x)
+{
+  n = 0;
+
+  bar ();
+
+  if (x && n)
+    return 0;
+
+  foo (x);
+}

diff --git a/gcc/tree-ssa-threadupdate.cc b/gcc/tree-ssa-threadupdate.cc
index 0f2b319d44ae33750851413d449e5eb1f590eaba..59c268a3567af9f08ec281a16d6f1a8eea7f345f 100644 (file)
--- a/gcc/tree-ssa-threadupdate.cc
+++ b/gcc/tree-ssa-threadupdate.cc
@@ -2679,7 +2679,8 @@ fwd_jt_path_registry::update_cfg (bool may_peel_loop_headers)
          {
            edge e = (*path)[j]->e;
            if (m_removed_edges->find_slot (e, NO_INSERT)
-               || ((*path)[j]->type == EDGE_COPY_SRC_BLOCK
+               || (((*path)[j]->type == EDGE_COPY_SRC_BLOCK
+                    || (*path)[j]->type == EDGE_COPY_SRC_JOINER_BLOCK)
                    && !can_duplicate_block_p (e->src)))
              break;
          }