From patchwork Tue Mar 19 14:47:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1913611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=CdcBlkLX; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Rim2yVd2; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=CdcBlkLX; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Rim2yVd2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TzZMp6zkYz1yX9 for ; Wed, 20 Mar 2024 01:48:06 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8E73A385840E for ; Tue, 19 Mar 2024 14:48:04 +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:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 932103858D37 for ; Tue, 19 Mar 2024 14:47:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 932103858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 932103858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710859666; cv=none; b=xSDLoal5Gla3rfQV7Jno5R/Yis1QC2FX44yY/ZjJyKzhOyOhGLH08exBK9W7voXuZbaYY2V3PmTAhbK8wkVCffmc2MFK+2Y7CAUeN7GVwp5Fq7LOYYNB5TaP3KN1vwF5gQgrQnMp1pmoTaqb7mL/TNqTRPpGBFA+C4ByRYnZ+B0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710859666; c=relaxed/simple; bh=S2kOt5liKDMPHcdmAjV4yUCS9vi3WMqT8mR4TfeUx64=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=AcPe+4vNKzTYt4e8aniCFHtfObCq/ZOIRb/ZvbqeU4bojjRJtxhhGejs6YDWZ5k7GMM+3O/SoSMIEsxLnw0EPrr99y3gc0Sh5GM3MYFvyPAe14nRRQ5yi0uEFdhiTPnymFPXIYHOCIjSSrkfNvJfQcMTlEn/ebI91HfQuEb7ALA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.4.150] (unknown [10.168.4.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 6799D5D7FC; Tue, 19 Mar 2024 14:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710859657; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=DBk0YkkXLEM6c5dZR+7SbEcBmkIGgVLhzLrTkhurD2U=; b=CdcBlkLXdRVoHFQTtQb2lV8/op2ClIN7vNZrr92KpQ27WPqhT85Zjy0vA1igj/C99g7xac 9o2vA/5N2DedNpyo3xz6V49/GW9NoXC2HIWgKu1w3Ah1aIrtbIXWhIPLm6NUTNtKxTI1Zn dy5g4v0F2MN2EdASIt7xXnYyfg91ZIw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710859657; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=DBk0YkkXLEM6c5dZR+7SbEcBmkIGgVLhzLrTkhurD2U=; b=Rim2yVd27aFNlDAenywiaeZ0XfXMb05yiestBYJA++5/JBGcIQFv6sed1BfThs1KH19lfs sFGlx6PGalDPPyAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710859657; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=DBk0YkkXLEM6c5dZR+7SbEcBmkIGgVLhzLrTkhurD2U=; b=CdcBlkLXdRVoHFQTtQb2lV8/op2ClIN7vNZrr92KpQ27WPqhT85Zjy0vA1igj/C99g7xac 9o2vA/5N2DedNpyo3xz6V49/GW9NoXC2HIWgKu1w3Ah1aIrtbIXWhIPLm6NUTNtKxTI1Zn dy5g4v0F2MN2EdASIt7xXnYyfg91ZIw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710859657; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=DBk0YkkXLEM6c5dZR+7SbEcBmkIGgVLhzLrTkhurD2U=; b=Rim2yVd27aFNlDAenywiaeZ0XfXMb05yiestBYJA++5/JBGcIQFv6sed1BfThs1KH19lfs sFGlx6PGalDPPyAg== Date: Tue, 19 Mar 2024 15:47:37 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: Jakub Jelinek Subject: [PATCH] middle-end/113396 - int128 array index and value-ranges MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spam-Level: X-Spam-Score: 0.73 X-Spamd-Result: default: False [0.73 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.03)[-0.156]; RCPT_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-0.64)[82.44%] X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Message-Id: <20240319144804.8E73A385840E@sourceware.org> The following fixes bogus truncation of a value-range for an int128 array index when computing the maximum extent for a variable array reference. Instead of possibly slowing things down by using widest_int the following makes sure the range bounds fit within the constraints offset_int were designed for. Bootstrap and regtest running on x86_64-unknown-linux-gnu. OK? Thanks, Richard. PR middle-end/113396 * tree-dfa.cc (get_ref_base_and_extent): Use index range bounds only if they fit within the address-range constraints of offset_int. * gcc.dg/torture/pr113396.c: New testcase. --- gcc/testsuite/gcc.dg/torture/pr113396.c | 19 +++++++++++++++++++ gcc/tree-dfa.cc | 6 ++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr113396.c diff --git a/gcc/testsuite/gcc.dg/torture/pr113396.c b/gcc/testsuite/gcc.dg/torture/pr113396.c new file mode 100644 index 00000000000..585f717bdda --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr113396.c @@ -0,0 +1,19 @@ +/* { dg-do run } */ +/* { dg-require-effective-target int128 } */ + +unsigned char m[] = {5, 79, 79, 79, 79}; +__int128 p; +int main() +{ + int g1 = 0; + p = 0; + for (int aj = 0; aj < 256; aj++) + { + m[0] = -4; + for (; p >= 0; p -= 1) { + g1 = m[p]; + } + } + if (g1 != 0xfc) + __builtin_abort(); +} diff --git a/gcc/tree-dfa.cc b/gcc/tree-dfa.cc index cbd3774b21f..93e53b29a6d 100644 --- a/gcc/tree-dfa.cc +++ b/gcc/tree-dfa.cc @@ -549,7 +549,8 @@ get_ref_base_and_extent (tree exp, poly_int64 *poffset, /* Try to constrain maxsize with range information. */ offset_int omax = offset_int::from (max, TYPE_SIGN (TREE_TYPE (index))); - if (known_lt (lbound, omax)) + if (wi::get_precision (max) <= ADDR_MAX_BITSIZE + && known_lt (lbound, omax)) { poly_offset_int rmaxsize; rmaxsize = (omax - lbound + 1) @@ -567,7 +568,8 @@ get_ref_base_and_extent (tree exp, poly_int64 *poffset, /* Try to adjust bit_offset with range information. */ offset_int omin = offset_int::from (min, TYPE_SIGN (TREE_TYPE (index))); - if (known_le (lbound, omin)) + if (wi::get_precision (min) <= ADDR_MAX_BITSIZE + && known_le (lbound, omin)) { poly_offset_int woffset = wi::sext (omin - lbound,