strlen: do not use cond_expr for boundaries

	PR tree-optimization/108137

gcc/ChangeLog:

	* tree-ssa-strlen.cc (get_range_strlen_phi): Reject anything
	different from INTEGER_CST.

gcc/testsuite/ChangeLog:

	* gcc.dg/tree-ssa/pr108137.c: New test.

(cherry picked from commit ee6f262b87fef590729e96e999f1c3b207c251c0)

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr108137.c b/gcc/testsuite/gcc.dg/tree-ssa/pr108137.c
new file mode 100644 (file)
index 0000000..f0cb71b
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr108137.c
@@ -0,0 +1,8 @@
+// PR tree-optimization/108137
+// { dg-do compile }
+// { dg-options "-Wformat-overflow" }
+
+void f(unsigned short x_port, unsigned int x_host)
+{
+    __builtin_printf("missing %s", x_port ? "host" : &"host:port"[x_host ? 5 : 0]);
+}

diff --git a/gcc/tree-ssa-strlen.cc b/gcc/tree-ssa-strlen.cc
index 9ae25d1dde25be08462e829e84b94383cb2648cd..2d7db6da5bc046e2e0b52336a9ec9c412493d13c 100644 (file)
--- a/gcc/tree-ssa-strlen.cc
+++ b/gcc/tree-ssa-strlen.cc
@@ -1136,14 +1136,15 @@ get_range_strlen_phi (tree src, gphi *phi,
 
       /* Adjust the minimum and maximum length determined so far and
         the upper bound on the array size.  */
-      if (!pdata->minlen
-         || tree_int_cst_lt (argdata.minlen, pdata->minlen))
+      if (TREE_CODE (argdata.minlen) == INTEGER_CST
+         && (!pdata->minlen
+             || tree_int_cst_lt (argdata.minlen, pdata->minlen)))
        pdata->minlen = argdata.minlen;
 
-      if (!pdata->maxlen
-         || (argdata.maxlen
-             && TREE_CODE (argdata.maxlen) == INTEGER_CST
-             && tree_int_cst_lt (pdata->maxlen, argdata.maxlen)))
+      if (TREE_CODE (argdata.maxlen) == INTEGER_CST
+         && (!pdata->maxlen
+             || (argdata.maxlen
+                 && tree_int_cst_lt (pdata->maxlen, argdata.maxlen))))
        pdata->maxlen = argdata.maxlen;
 
       if (!pdata->maxbound