From patchwork Thu May 25 05:35:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 1785912 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=qMJgb7uP; dkim-atps=neutral Received: from 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QRcGd6pvHz20Pb for ; Thu, 25 May 2023 15:35:53 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A5CA83857716 for ; Thu, 25 May 2023 05:35:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5CA83857716 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684992951; bh=QTi5pPImvEx3WoY8rQmiqd6dupjq+nRn1xqL9gRtTxA=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=qMJgb7uPO3Obuhu7c69hgONQkq4b7JqOHAh3eQCxNv7ooGLazXGkITfwNGNUBnOk/ m3EPujHEvwj3S+rxClgnl7oU76x5/FzWr9YcuHkOJYwEu/wOSVxEby2TizN1sfhHOw nuAn3qE+QL5TTI9Yoe8gPCs/n52Eim3q0Om627bY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id A4A333858D3C for ; Thu, 25 May 2023 05:35:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A4A333858D3C Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-518-OxhHZvfxN2WeM2SeOP4snA-1; Thu, 25 May 2023 01:35:26 -0400 X-MC-Unique: OxhHZvfxN2WeM2SeOP4snA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BC90C1C0A581 for ; Thu, 25 May 2023 05:35:25 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.192.64]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 548492166B2B; Thu, 25 May 2023 05:35:25 +0000 (UTC) Received: from abulafia.quesejoda.com (localhost [127.0.0.1]) by abulafia.quesejoda.com (8.17.1/8.17.1) with ESMTPS id 34P5ZN2S244702 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 25 May 2023 07:35:23 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 34P5ZNeR244701; Thu, 25 May 2023 07:35:23 +0200 To: GCC patches Cc: Andrew MacLeod , Aldy Hernandez Subject: [COMMITTED] Disallow setting of NANs in frange setter unless setting trees. Date: Thu, 25 May 2023 07:35:19 +0200 Message-Id: <20230525053520.244673-3-aldyh@redhat.com> In-Reply-To: <20230525053520.244673-1-aldyh@redhat.com> References: <20230525053520.244673-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Aldy Hernandez via Gcc-patches From: Aldy Hernandez Reply-To: Aldy Hernandez Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" frange::set() is confusing in that we can set a NAN by specifying a bound of +-NAN, even though we tecnically disallow NANs in the setter because the kind can never be VR_NAN. This is a wart for get_tree_range(), which builds a range out of a tree from the source, to work correctly. It's ugly, and it showed its limitation while implementing LTO streaming of ranges. This patch disallows passing NAN bounds in frange::set() and fixes get_tree_range. gcc/ChangeLog: * value-query.cc (range_query::get_tree_range): Set NAN directly if necessary. * value-range.cc (frange::set): Assert that bounds are not NAN. --- gcc/value-query.cc | 13 ++++++++++--- gcc/value-range.cc | 9 +-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gcc/value-query.cc b/gcc/value-query.cc index 43297f17c39..a84f164d77b 100644 --- a/gcc/value-query.cc +++ b/gcc/value-query.cc @@ -189,9 +189,16 @@ range_query::get_tree_range (vrange &r, tree expr, gimple *stmt) { frange &f = as_a (r); REAL_VALUE_TYPE *rv = TREE_REAL_CST_PTR (expr); - f.set (TREE_TYPE (expr), *rv, *rv); - if (!real_isnan (rv)) - f.clear_nan (); + if (real_isnan (rv)) + { + bool sign = real_isneg (rv); + f.set_nan (TREE_TYPE (expr), sign); + } + else + { + nan_state nan (false); + f.set (TREE_TYPE (expr), *rv, *rv, nan); + } return true; } diff --git a/gcc/value-range.cc b/gcc/value-range.cc index 2f37ff3e58e..707b1f15fd4 100644 --- a/gcc/value-range.cc +++ b/gcc/value-range.cc @@ -359,14 +359,7 @@ frange::set (tree type, gcc_unreachable (); } - // Handle NANs. - if (real_isnan (&min) || real_isnan (&max)) - { - gcc_checking_assert (real_identical (&min, &max)); - bool sign = real_isneg (&min); - set_nan (type, sign); - return; - } + gcc_checking_assert (!real_isnan (&min) && !real_isnan (&max)); m_kind = kind; m_type = type;