From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bee.birch.relay.mailchannels.net (bee.birch.relay.mailchannels.net [23.83.209.14]) by sourceware.org (Postfix) with ESMTPS id 0ED1C3858D20 for ; Thu, 25 Jul 2024 23:48:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0ED1C3858D20 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0ED1C3858D20 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=23.83.209.14 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1721951333; cv=pass; b=N9BCYmHmRCJbHBEdG3+p8QHWb0s7DNgktMBZwgHicFUMJE40okFWsD1pFMdihl+oEjxWH3i0tjyk3N16WTrObWUGif/LShklSSgmoq45Dmk2TvUPzpuzMcLIS6SNImRhVyHblK28J5vKVnE1SMONGKoAOY+VNllGjdmVH7xTguA= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1721951333; c=relaxed/simple; bh=Lmm3CD1Yhuf+/uEEx/cwdv1S8U7jJLpNb1HJi2QCOaQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=NFbWzwGUF8F0R1gTwyTMVD1nZE9PsWUvN3+BvaEG4IRtYnLWfoqfrB9nPDkUUx0YQqY/CCTu/WSFrXx4vcl0pSGri8/UQOZBN8ebw7fW7ONHgbfHfNPJiryJdUrQZGvnEIF7dtXKUuiQ81URq9zL5FP15uroGsLtkG4uPo9SJ6c= ARC-Authentication-Results: i=2; server2.sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 508A37A6A56 for ; Thu, 25 Jul 2024 23:48:42 +0000 (UTC) Received: from pdx1-sub0-mail-a260.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 02AD17A68BA for ; Thu, 25 Jul 2024 23:48:42 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1721951322; a=rsa-sha256; cv=none; b=0b+4mNpVec9IispVQJ8xv5CfXlXWSiHvt9pgrO0qqUx2mf2Hd5LzeXDNVG0kXF0FTum8tL i1kHwVhxmFcN9K/oOAejm8TFlBlZTTHb+IBq2ssSkmrlVwf37mhTDPx44d4abzPyJru4kF 6r/5AOSTnxa0r8WjvQ//0287bPvop7yBH9eZG4fOTFAKiZLjoRUheS7SchAupdtBFQ3Gmp fpadY6TSmmZ+gzkD38BAtydozR2Er+f1MgpA8JNyO+m4Xe69NcsCfcOuVHiVLjqJR5XY67 bgIJqApa5SeLhLapEjCX/4tweBjJMDYspmOdykXAlqbUHiw1+WpZIskGEgE/mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1721951322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=Ldme0F5y0Bwg0HYZ0BvnN3abgheBumFctUQdqvQ7F5Q=; b=WD7SjTIu18uNHPynpIpTqUJQE5G0bU3I7Erd2QwTfGYQrmJVbpbRqRqH1UB32gqQppcmvu wvWGtJuHYmlC8zk+96XRBI5v/DpihKgVL/0ILz81udwpvhPyK7vSuJOuNydGPhSeCFjxVZ WI88Uue0Jyn42LoZ0oieQHteO1fEXeF1zxY89ZUeN05prRvN8+o60fpCRrUbJ6l7Sdypkg g/jH4HcbwDlptvWHNJzjR7vq9bAq8DygVk0xxkEcCjp1Y6x41xvcq85aqJvH9FvQftiLVO hPgFKA2nMLE0OzUKsWk/vcckDWKAMexXILHQYorzYsCikXf8fz5d4DI+eo7Uzw== ARC-Authentication-Results: i=1; rspamd-7f77fccf7d-2j4ms; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Lonely-Fearful: 43b2fc0a45be418e_1721951322210_781517499 X-MC-Loop-Signature: 1721951322210:3377367627 X-MC-Ingress-Time: 1721951322210 Received: from pdx1-sub0-mail-a260.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.104.67.59 (trex/7.0.2); Thu, 25 Jul 2024 23:48:42 +0000 Received: from fedora.redhat.com (unknown [24.114.78.143]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a260.dreamhost.com (Postfix) with ESMTPSA id 4WVSJT40q0zB2 for ; Thu, 25 Jul 2024 16:48:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1721951321; bh=Ldme0F5y0Bwg0HYZ0BvnN3abgheBumFctUQdqvQ7F5Q=; h=From:To:Subject:Date:Content-Transfer-Encoding; b=eVx0eVGLDB12M6qO5N4nshKiIfQfR+vbk+cciedrPRbVWnd4u05AzD7+5FPuLzb92 5ae94fIHiyVi0OqdTtO8ULS7b0sr+zUnA+KuM7QbImRlo6cS+4GQwrpOD0Z+JU8tSy YowNbcWE2oie520JDE4qTlkybCv6AO4Vd9xqXHB4gG6FAt2DXAhZgqw/RQxFyAtJD9 P5vs64Pe6VpN5wjfVvcpIuURe1yb52AZwHHDplP4WiN6Lgx2lK4gNdydlrwhhpBVJ/ nHnmQ4Yz6/nggVyDts05rA26OIWZzQTiM2ZtZq9OsPM1L65tTax4uE76HldTjh6g4x e5iDKohojo0qA== From: Siddhesh Poyarekar To: gcc-patches@gcc.gnu.org Subject: [PATCH] gimple-ssa-sprintf: Fix typo in range check Date: Thu, 25 Jul 2024 19:48:38 -0400 Message-ID: <20240725234838.3804003-1-siddhesh@gotplt.org> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3036.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,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 List-Id: The code to scale ranges for wide chars in format_string incorrectly checks range.likely to scale range.unlikely, which is a copy-paste typo from the immediate previous condition. gcc/ChangeLog: gimple-ssa-sprintf.cc (format_string): Fix type in range check for UNLIKELY for wide chars. Signed-off-by: Siddhesh Poyarekar --- Tested on x86_64, no new testsuite regressions due to this fix. gcc/gimple-ssa-sprintf.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/gimple-ssa-sprintf.cc b/gcc/gimple-ssa-sprintf.cc index 025b0fbff6f..0900710647c 100644 --- a/gcc/gimple-ssa-sprintf.cc +++ b/gcc/gimple-ssa-sprintf.cc @@ -2623,7 +2623,7 @@ format_string (const directive &dir, tree arg, pointer_query &ptr_qry) if (slen.range.likely < target_int_max ()) slen.range.likely *= 2; - if (slen.range.likely < target_int_max ()) + if (slen.range.unlikely < target_int_max ()) slen.range.unlikely *= target_mb_len_max (); /* A non-empty wide character conversion may fail. */ -- 2.45.1