From: Jeff Law <law@redhat.com>
Date: Wed, 1 May 2019 17:33:32 +0000 (-0600)
Subject: re PR tree-optimization/88797 (Unneeded branch added when function is inlined (functi... 
X-Git-Tag: misc/cutover-git~5821
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d36405344205c58beb1947719345ec80fdc00a34;p=thirdparty%2Fgcc.git

re PR tree-optimization/88797 (Unneeded branch added when function is inlined (function runs faster if not inlined))

	PR tree-optimization/88797
	* gimple-ssa-split-paths (is_feasible_trace): Reject cases where the
	PHI feeds a conditional on the RHS of an assignment.

	PR tree-optimization/88797
	* g++.dg/tree-ssa/pr88797.C: New test.

From-SVN: r270775
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b6b501fe8301..7f6ccd98c111 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-01  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/88797
+	* gimple-ssa-split-paths (is_feasible_trace): Reject cases where the
+	PHI feeds a conditional on the RHS of an assignment.
+
 2019-04-30  Andrew Waterman  <andrew@sifive.com>
 	    Jim Wilson  <jimw@sifive.com>
 
diff --git a/gcc/gimple-ssa-split-paths.c b/gcc/gimple-ssa-split-paths.c
index 33bbb66674b1..5bf45eeac28c 100644
--- a/gcc/gimple-ssa-split-paths.c
+++ b/gcc/gimple-ssa-split-paths.c
@@ -264,8 +264,12 @@ is_feasible_trace (basic_block bb)
 	  if (is_gimple_debug (stmt))
 	    continue;
 	  /* If there's a use in the joiner this might be a CSE/DCE
-	     opportunity.  */
-	  if (gimple_bb (stmt) == bb)
+	     opportunity, but not if the use is in a conditional
+	     which makes this a likely if-conversion candidate.  */
+	  if (gimple_bb (stmt) == bb
+	      && (!is_gimple_assign (stmt)
+		  || (TREE_CODE_CLASS (gimple_assign_rhs_code (stmt))
+		      != tcc_comparison)))
 	    {
 	      found_useful_phi = true;
 	      break;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1427a8ee523f..3620c23f82ed 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-01  Jeff Law  <law@redhat.com>
+
+	PR tree-optimization/90037
+	* g++.dg/tree-ssa/pr88797.C: New test.
+
 2019-05-01  Nathan Sidwell  <nathan@acm.org>
 
 	* g++.dg/cpp0x/decltype9.C: Adjust expected diagnostics.
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr88797.C b/gcc/testsuite/g++.dg/tree-ssa/pr88797.C
new file mode 100644
index 000000000000..75391d6c049a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr88797.C
@@ -0,0 +1,16 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fdump-tree-split-paths-details" } */
+
+
+void use(unsigned);
+bool f(unsigned x, unsigned y) {
+    return x < 1111 + (y <= 2222);
+}
+void test_f(unsigned x, unsigned y) {
+    for (unsigned i = 0; i < 3333; ++i)
+        use(f(x++, y++));
+}
+
+/* { dg-final { scan-tree-dump-not "Duplicating join block" "split-paths" } } */
+/* { dg-final { scan-tree-dump-times "Block . is a join that does not expose" 1 "split-paths" } } */
+