From fb5607ae6ad468fe1183b7a3b392d445010ada41 Mon Sep 17 00:00:00 2001 From: Aldy Hernandez Date: Thu, 2 Mar 2023 16:56:12 +0100 Subject: [PATCH] Convert compare_nonzero_chars to wide_ints. gcc/ChangeLog: * tree-ssa-strlen.cc (compare_nonzero_chars): Convert to wide_ints. --- gcc/tree-ssa-strlen.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/tree-ssa-strlen.cc b/gcc/tree-ssa-strlen.cc index 0bbcb04834f..de785281b27 100644 --- a/gcc/tree-ssa-strlen.cc +++ b/gcc/tree-ssa-strlen.cc @@ -359,10 +359,10 @@ compare_nonzero_chars (strinfo *si, gimple *stmt, of the length range are equal return the result of the comparison same as in the constant case. Otherwise return a conservative result. */ - tree lower = wide_int_to_tree (vr.type (), vr.lower_bound ()); - tree upper = wide_int_to_tree (vr.type (), vr.upper_bound ()); - int cmpmin = compare_tree_int (lower, off); - if (cmpmin > 0 || tree_int_cst_equal (lower, upper)) + signop sign = TYPE_SIGN (vr.type ()); + unsigned prec = TYPE_PRECISION (vr.type ()); + int cmpmin = wi::cmp (vr.lower_bound (), wi::uhwi (off, prec), sign); + if (cmpmin > 0 || vr.singleton_p ()) return cmpmin; return -1;