From 5cc8cb04de4285bfa85c16073e99185b41c38f85 Mon Sep 17 00:00:00 2001
From: Joern Rennecke <joern.rennecke@riscy-ip.com>
Date: Mon, 1 Jul 2019 21:48:55 +0000
Subject: [PATCH] re PR tree-optimization/66726 (missed optimization, factor
 conversion out of COND_EXPR)

        PR middle-end/66726
        * tree-ssa-phiopt.c (factor_out_conditional_conversion):
        Tune heuristic from PR71016 to allow MIN / MAX.
        * testsuite/gcc.dg/tree-ssa/pr66726-4.c: New testcase.

From-SVN: r272911
---
 gcc/ChangeLog                             |  7 +++++++
 gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c | 12 ++++++++++++
 gcc/tree-ssa-phiopt.c                     | 19 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4e80c34e8ae..dad3442b949 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-07-01  Joern Rennecke  <joern.rennecke@riscy-ip.com>
+
+	PR middle-end/66726
+	* tree-ssa-phiopt.c (factor_out_conditional_conversion):
+	Tune heuristic from PR71016 to allow MIN / MAX.
+	* testsuite/gcc.dg/tree-ssa/pr66726-4.c: New testcase.
+
 2019-07-01  Segher Boessenkool  <segher@kernel.crashing.org>
 
 	* config/rs6000/rs6000.md (ieee_128bit_vsx_abs<mode>2): Make this a
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c
new file mode 100644
index 00000000000..4e43522f3a3
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-phiopt1-details" } */
+
+#define SAT(x) (x < 0 ? 0 : (x > 255 ? 255 : x))
+
+void
+foo (unsigned char *p, int i)
+{
+  *p = SAT (i);
+}
+
+/* { dg-final { scan-tree-dump-times "COND_EXPR .*and PHI .*converted to straightline code" 1 "phiopt1" } } */
diff --git a/gcc/tree-ssa-phiopt.c b/gcc/tree-ssa-phiopt.c
index 90674a2f3c4..7088ff91998 100644
--- a/gcc/tree-ssa-phiopt.c
+++ b/gcc/tree-ssa-phiopt.c
@@ -504,7 +504,24 @@ factor_out_conditional_conversion (edge e0, edge e1, gphi *phi,
 		  gsi = gsi_for_stmt (arg0_def_stmt);
 		  gsi_prev_nondebug (&gsi);
 		  if (!gsi_end_p (gsi))
-		    return NULL;
+		    {
+		      if (gassign *assign
+			    = dyn_cast <gassign *> (gsi_stmt (gsi)))
+			{
+			  tree lhs = gimple_assign_lhs (assign);
+			  enum tree_code ass_code
+			    = gimple_assign_rhs_code (assign);
+			  if (ass_code != MAX_EXPR && ass_code != MIN_EXPR)
+			    return NULL;
+			  if (lhs != gimple_assign_rhs1 (arg0_def_stmt))
+			    return NULL;
+			  gsi_prev_nondebug (&gsi);
+			  if (!gsi_end_p (gsi))
+			    return NULL;
+			}
+		      else
+			return NULL;
+		    }
 		  gsi = gsi_for_stmt (arg0_def_stmt);
 		  gsi_next_nondebug (&gsi);
 		  if (!gsi_end_p (gsi))
-- 
2.30.2