From patchwork Wed Jan 11 11:27:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 41900 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3263608wrt; Wed, 11 Jan 2023 03:27:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXti+G2/Ug80sVvBraKsQEA6iogE0LWGi2JZqNknk03I1ZZTxrTJeF4u4DYr9+lbBNqaSQkV X-Received: by 2002:a17:906:1c89:b0:7c0:b3a3:9b70 with SMTP id g9-20020a1709061c8900b007c0b3a39b70mr67171618ejh.62.1673436458269; Wed, 11 Jan 2023 03:27:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673436458; cv=none; d=google.com; s=arc-20160816; b=SFV3IuWn82jHcStMBHtF2ByHx2dZodE3lUlipU+ayePbhExkl3TIAFybal5n9WtyC8 0gO7Zp4FoYWK3DZaIsn9gX5IdAW6R4I5BBwNqMLGXJsYSXZdfXQi2QUsPD7IEyyYbelw 7rDyMxcQM869jgHVw5N2tPKTVLuojRNFQ3UtWdNmwP7HykTM5yk4dYiwAolZA6KPttZ8 3RLWE8gF22SdCGe6/pjkO8faHjV4AkRBYU3Jyn064bj1Adr1u2fmO0yaidOIjGxC/QBa wrEF60v5vo3R2Cfuk0HfxcrpKHzILT0ES++VTMu8bIWavlorgpbhQ9luIZKsMHjoXDBg /gAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :content-language:to:subject:from:user-agent:mime-version:date :message-id:dkim-signature:dkim-signature:dmarc-filter:delivered-to; bh=UyBNGv2nQwj3eAYWAshlfpePylP/cd/ddmPfZgEaioE=; b=k0YKp/9xAVSbOw2aq6pebp6F2aLEsc2EcT4X91tD8Ef5gnDDPpDl45m5SLfThAC6lq V0BUfEsmZbBi2d6h6TVHRf3tWLUSo5wmhcR2PxlzQ7fpejnkywUa/+Gx2VNDbGv6Znnc CrQSmZLHpyDozt34ovUQxC9yVmSlhuxJhNkC/6JTTU6VfrXZgQTXe8VcHtSATENxOpGJ jmNadjPgDjtF6Ffbljr1F58hvs0XY4E/8XIPlkeAZmpl3R//rzsP928KkyfDjzBVjplE 5X/u2ARKevLYg7NleScTES0gfan7CDYm2wfLcbw8N9YWDzu0N7F9j5u82A7NhMfqWeTJ 255w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=crhGMXie; dkim=neutral (no key) header.i=@gcc.gnu.org header.s=susede2_ed25519 header.b=u6TsaR7Z; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id dp15-20020a170906c14f00b007ae5b41855fsi14355214ejc.895.2023.01.11.03.27.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 03:27:38 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.cz header.s=susede2_rsa header.b=crhGMXie; dkim=neutral (no key) header.i=@gcc.gnu.org header.s=susede2_ed25519 header.b=u6TsaR7Z; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3BC98385B52F for ; Wed, 11 Jan 2023 11:27:33 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id B07D03858C52 for ; Wed, 11 Jan 2023 11:27:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B07D03858C52 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 69EEC46F4 for ; Wed, 11 Jan 2023 11:27:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1673436427; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UyBNGv2nQwj3eAYWAshlfpePylP/cd/ddmPfZgEaioE=; b=crhGMXie150Xau9GMjtNbpLdIqXTFyFINCDxDxuQqqxlX7Rwoi9ZbNbqeUkefRQytPrjln OxWuZwyoGCXl9Un7fMWswafeFpWfbGOWNn/c5GKhW/Dp7JDX+wLNyLBvfTMDHGgfH5/YUh xSCvctyJ2BAV2F4cqgIT8nCzYWOuKeA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1673436427; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UyBNGv2nQwj3eAYWAshlfpePylP/cd/ddmPfZgEaioE=; b=u6TsaR7ZxUqE6y5NDPpcts9DXY7liaYHkcQ+7DS5rySO1Sb96uQbUcgtSHWQShgnp4/sp4 RUCXYtZhuvtqnuAw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5DEFD1358A for ; Wed, 11 Jan 2023 11:27:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id WMLTFQudvmM7JwAAMHmgww (envelope-from ) for ; Wed, 11 Jan 2023 11:27:07 +0000 Message-ID: Date: Wed, 11 Jan 2023 12:27:07 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [gcc-12 backport] strlen: do not use cond_expr for boundaries To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_SOFTFAIL, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754725307397521765?= X-GMAIL-MSGID: =?utf-8?q?1754725307397521765?= Tested, I'm going to push it. Martin 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) --- gcc/testsuite/gcc.dg/tree-ssa/pr108137.c | 8 ++++++++ gcc/tree-ssa-strlen.cc | 13 +++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr108137.c 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