public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/users/marxin/heads/PR108137-strlen-ice)] strlen: do not use cond_expr for boundaries
@ 2022-12-23 14:29 Martin Liska
0 siblings, 0 replies; only message in thread
From: Martin Liska @ 2022-12-23 14:29 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:3fbc10fa6b6aa2c264905af5f55c36c021ea0f99
commit 3fbc10fa6b6aa2c264905af5f55c36c021ea0f99
Author: Martin Liska <mliska@suse.cz>
Date: Fri Dec 23 15:27:32 2022 +0100
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.
Diff:
---
gcc/testsuite/gcc.dg/tree-ssa/pr108137.c | 8 ++++++++
gcc/tree-ssa-strlen.cc | 13 +++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr108137.c b/gcc/testsuite/gcc.dg/tree-ssa/pr108137.c
new file mode 100644
index 00000000000..f0cb71b2267
--- /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 abec225566d..a2edac4c77f 100644
--- 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-12-23 14:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-23 14:29 [gcc(refs/users/marxin/heads/PR108137-strlen-ice)] strlen: do not use cond_expr for boundaries Martin Liska
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).