From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 52768385802F; Wed, 11 Jan 2023 10:29:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 52768385802F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1673432945; bh=sGD4Y9znyGWXpuhGmtePAw5rhGm2xLCiJDP0irq3ewI=; h=From:To:Subject:Date:From; b=UW6J4Fo5Xfa4qw/iGUecrp1Xh67MomzeS/lX7Vf/KRLDwcRIjLFitf3Sa0v6sh2o7 yNJAvBbtzPeqOMvV6GN9f+t1s5qeuDgJ0mUDIc8t4tvi+2YNGvnIE+/tWih3Zq3rHr 9eqgAyEZ3jnXq0PLRY+Fx+0DVcPEggxHlOZR/ljo= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/backport-12)] strlen: do not use cond_expr for boundaries X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/backport-12 X-Git-Oldrev: 14e25006c8d2c1245414a6145188161a6bf7064d X-Git-Newrev: 473d7154291cb3733f10cc0259cd9d8238a76d78 Message-Id: <20230111102905.52768385802F@sourceware.org> Date: Wed, 11 Jan 2023 10:29:05 +0000 (GMT) List-Id: https://gcc.gnu.org/g:473d7154291cb3733f10cc0259cd9d8238a76d78 commit 473d7154291cb3733f10cc0259cd9d8238a76d78 Author: Martin Liska 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. (cherry picked from commit ee6f262b87fef590729e96e999f1c3b207c251c0) 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 9ae25d1dde2..2d7db6da5bc 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