When CD-DCE creates forwarders to reduce false control dependences
it fails to update the irreducible state of edge and the forwarder
block in case the fowarder groups both normal (entry) and edges
from an irreducible region (necessarily backedges). This is because
when we split the first edge, if that's a normal edge, the forwarder
and its edge to the original block will not be marked as part
of the irreducible region but when we then redirect an edge from
within the region it becomes so.
The following fixes this up.
Note I think creating a forwarder that includes backedges is
likely not going to help, but at this stage I don't want to change
the CFG going into DCE. For regular loops we'll have a single
entry and a single backedge by means of loop init and will never
create a forwarder - so this is solely happening for irreducible
regions where it's harder to prove that such forwarder doesn't help.
Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed.
PR tree-optimization/117979
* tree-ssa-dce.cc (make_forwarders_with_degenerate_phis):
Properly update the irreducible region state.
* gcc.dg/torture/pr117979.c: New testcase.
---
gcc/testsuite/gcc.dg/torture/pr117979.c | 21 +++++++++++++++++++++
gcc/tree-ssa-dce.cc | 10 ++++++++++
2 files changed, 31 insertions(+)
create mode 100644 gcc/testsuite/gcc.dg/torture/pr117979.c
diff --git a/gcc/testsuite/gcc.dg/torture/pr117979.c
b/gcc/testsuite/gcc.dg/torture/pr117979.c
new file mode 100644
index 00000000000..646cd70776b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr117979.c
@@ -0,0 +1,21 @@
+/* { dg-do compile } */
+
+int a, b;
+void foo (void);
+int __attribute__((returns_twice)) bar (int);
+
+int __attribute__((const))
+baz (int f)
+{
+ if (f)
+ {
+ l:;
+ for (f = 0; f < 6; ++f)
+ if (bar (b))
+ goto l;
+ for (;; a--)
+ ;
+ }
+ foo ();
+ return 0;
+}
diff --git a/gcc/tree-ssa-dce.cc b/gcc/tree-ssa-dce.cc
index adc79410331..5b3037ac625 100644
--- a/gcc/tree-ssa-dce.cc
+++ b/gcc/tree-ssa-dce.cc
@@ -2032,14 +2032,24 @@ make_forwarders_with_degenerate_phis (function *fn)
free_dominance_info (fn, CDI_DOMINATORS);
basic_block forwarder = split_edge (args[start].first);
profile_count count = profile_count::zero ();
+ bool irr = false;
for (unsigned j = start + 1; j < i; ++j)
{
edge e = args[j].first;
+ if (e->flags & EDGE_IRREDUCIBLE_LOOP)
+ irr = true;
redirect_edge_and_branch_force (e, forwarder);
redirect_edge_var_map_clear (e);
count += e->count ();
}
forwarder->count = count;
+ if (irr)
+ {
+ forwarder->flags |= BB_IRREDUCIBLE_LOOP;
+ single_succ_edge (forwarder)->flags
+ |= EDGE_IRREDUCIBLE_LOOP;
+ }
+
if (vphi)
{
tree def = copy_ssa_name (vphi_args[0]);
--
2.43.0
