[PATCH] tree-optimization/114151 - handle POLY_INT_CST in get_range_pos_neg

[Richard Biener <rguenther@suse.de>]

The following switches the logic in chrec_fold_multiply to
get_range_pos_neg since handling POLY_INT_CST possibly mixed with
non-poly ranges will make the open-coding awkward and while not
a perfect fit it should work.

In turn the following makes get_range_pos_neg aware of POLY_INT_CSTs.
I couldn't make it work with poly_wide_int since the compares always
fail to build but poly_widest_int works fine and it should be
semantically the same.  I've also changed get_range_pos_neg to
use get_range_query (cfun), problematical passes shouldn't have
a range query activated so it shouldn't make a difference there.

This doesn't make a difference for the PR but not considering
POLY_INT_CSTs was a mistake.

Bootstrap and regtest running on x86_64-unknown-linux-gnu, OK?

Thanks,
Richard.

	PR tree-optimization/114151
	* tree.cc (get_range_pos_neg): Handle POLY_INT_CST, use
	the passes range-query if available.
	* tree-chre.cc (chrec_fold_multiply): Use get_range_pos_neg
	to see if both operands have the same range.
---
 gcc/tree-chrec.cc | 14 ++------------
 gcc/tree.cc       | 12 +++++++-----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/gcc/tree-chrec.cc b/gcc/tree-chrec.cc
index 2e6c7356d3b..450d018ce6f 100644
--- a/gcc/tree-chrec.cc
+++ b/gcc/tree-chrec.cc
@@ -442,18 +442,8 @@ chrec_fold_multiply (tree type,
 	  if (!ANY_INTEGRAL_TYPE_P (type)
 	      || TYPE_OVERFLOW_WRAPS (type)
 	      || integer_zerop (CHREC_LEFT (op0))
-	      || (TREE_CODE (CHREC_LEFT (op0)) == INTEGER_CST
-		  && TREE_CODE (CHREC_RIGHT (op0)) == INTEGER_CST
-		  && (tree_int_cst_sgn (CHREC_LEFT (op0))
-		      == tree_int_cst_sgn (CHREC_RIGHT (op0))))
-	      || (get_range_query (cfun)->range_of_expr (rl, CHREC_LEFT (op0))
-		  && !rl.undefined_p ()
-		  && (rl.nonpositive_p () || rl.nonnegative_p ())
-		  && get_range_query (cfun)->range_of_expr (rr,
-							    CHREC_RIGHT (op0))
-		  && !rr.undefined_p ()
-		  && ((rl.nonpositive_p () && rr.nonpositive_p ())
-		      || (rl.nonnegative_p () && rr.nonnegative_p ()))))
+	      || (get_range_pos_neg (CHREC_LEFT (op0))
+		  | get_range_pos_neg (CHREC_RIGHT (op0))) != 3)
 	    {
 	      tree left = chrec_fold_multiply (type, CHREC_LEFT (op0), op1);
 	      tree right = chrec_fold_multiply (type, CHREC_RIGHT (op0), op1);
diff --git a/gcc/tree.cc b/gcc/tree.cc
index f801712c9dd..fcc914f0f7a 100644
--- a/gcc/tree.cc
+++ b/gcc/tree.cc
@@ -14408,13 +14408,15 @@ get_range_pos_neg (tree arg)
 
   int prec = TYPE_PRECISION (TREE_TYPE (arg));
   int cnt = 0;
-  if (TREE_CODE (arg) == INTEGER_CST)
+  if (poly_int_tree_p (arg))
     {
-      wide_int w = wi::sext (wi::to_wide (arg), prec);
-      if (wi::neg_p (w))
+      poly_widest_int w = wi::sext (wi::to_poly_widest (arg), prec);
+      if (known_lt (w, 0))
 	return 2;
-      else
+      else if (known_ge (w, 0))
 	return 1;
+      else
+	return 3;
     }
   while (CONVERT_EXPR_P (arg)
 	 && INTEGRAL_TYPE_P (TREE_TYPE (TREE_OPERAND (arg, 0)))
@@ -14434,7 +14436,7 @@ get_range_pos_neg (tree arg)
   if (TREE_CODE (arg) != SSA_NAME)
     return 3;
   value_range r;
-  while (!get_global_range_query ()->range_of_expr (r, arg)
+  while (!get_range_query (cfun)->range_of_expr (r, arg)
 	 || r.undefined_p () || r.varying_p ())
     {
       gimple *g = SSA_NAME_DEF_STMT (arg);
-- 
2.35.3