From patchwork Tue Nov 15 16:31:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 20469 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2825640wru; Tue, 15 Nov 2022 08:32:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf6q4zxhX9MOparKWXC2gE9OX0DpTBLEjw7zuIqpY6II54zKEQobuxgFZXzE+/cfD0eCtiKL X-Received: by 2002:a17:906:b142:b0:7ae:2964:72dc with SMTP id bt2-20020a170906b14200b007ae296472dcmr15020966ejb.111.1668529951588; Tue, 15 Nov 2022 08:32:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668529951; cv=none; d=google.com; s=arc-20160816; b=uMl0dTVY3fx7iWzaAl9rJwfNQhbpgO8I89xuTKtFMUfflg3eN88OYYeKW67z8JfO12 kAsBZ0UZNJvFbB7oW8aK9WEqDw3exNn1JCQfvONxtV12wj0QbXW/ezil2E8s7WClD8Bo HXDFWh+M225uf43ehdBWoNtcl9Oz93mr2ya7RgiDZtY+nXQ68wvPh8VGVI1D8aucUpdF d9VfdUBcrCZu5ZfcsI/wenhl2tCO484GEgIw1k3u44yOfVtIM5Pypg5m21fuZ9VeiGVv 7Czp4Si4UMg9XonIjyXgZX6kYT1DqbbN6L0kX/JbvPtwTiZhpLRFcS51/wqyftPbKXVo IGaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=tpIEMEFZhKEhic74mSIFUzTzf/1CvyCv3l3ewwLuzB4=; b=kaOJk6nViCf63zGtBeotzJiS6CpN0KKGUbp1KL53UqASkm/9ubjRN97OOUKZy8rSNF jnjqP/SNY6+nGkt94i88cbOQ2KSwLs422tZjBxeiJbKINwCcBELBehEh6qy7wZXGQZWy 8k3VnUEIhT+q4lyq0UzYUFDfzZ/kda640Ehn6dd3Rie3ShhgNAQxPf4JCSFEzyAtcIlo M2b2u0ifZ1+8Gtpm4CdnlgBCRVaEO+r4oppD7P4WoIJooT/0BvH+XWtD/TWbCH/CHGVr cKwvfFLjnmx7EC4rAhQh02tHV8BLLbbYgLnDGNa+7x6vW03f/hvxIKksSHxGxELIIMhc hKzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ACtFCjVf; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id sh19-20020a1709076e9300b007ae9abf1994si6976290ejc.837.2022.11.15.08.32.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 08:32:31 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ACtFCjVf; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 752D53899019 for ; Tue, 15 Nov 2022 16:32:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 752D53899019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668529950; bh=tpIEMEFZhKEhic74mSIFUzTzf/1CvyCv3l3ewwLuzB4=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ACtFCjVf1TTWOi4AYl/A5DkxFKA9UiM1A+PlH0obW7zvKoTBqUeGSa4m538+eMPlP MwIP5Svz61shj3tzFF6vSYBc6JQ2vNYWDk6ieIKe8zRL6Tj2drTAb9bp3nA5NG9J7E 43y4rWUpPGvWDXEzO7i8mV+JDpR/vHrYB30fixsA= 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 093563898C75 for ; Tue, 15 Nov 2022 16:31:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 093563898C75 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-170-MkYQaikRPXmNn_9_qR0hdA-1; Tue, 15 Nov 2022 11:31:44 -0500 X-MC-Unique: MkYQaikRPXmNn_9_qR0hdA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 391991C05AC3 for ; Tue, 15 Nov 2022 16:31:44 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.195.161]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C648F39D6A; Tue, 15 Nov 2022 16:31:43 +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 2AFGVdWh604266 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 15 Nov 2022 17:31:39 +0100 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 2AFGVd1L604265; Tue, 15 Nov 2022 17:31:39 +0100 To: Jakub Jelinek Cc: GCC patches , Andrew MacLeod , Aldy Hernandez Subject: [PATCH] [range-ops] Minor readability fix. Date: Tue, 15 Nov 2022 17:31:35 +0100 Message-Id: <20221115163135.604240-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 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 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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749580462596209498?= X-GMAIL-MSGID: =?utf-8?q?1749580462596209498?= I know it's past the end of stage1, but I'm afraid we'll drag this around forever in the GCC12 branch, and it's an easy readbility fix. p.s. Or if you prefer: if (!lb_nan && !ub_nan && !maybe_nan && ....) r.clear_nan (); OK for trunk? gcc/ChangeLog: * range-op-float.cc (range_operator_float::fold_range): Make check for maybe_isnan more readable. --- gcc/range-op-float.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gcc/range-op-float.cc b/gcc/range-op-float.cc index 53a0928c6aa..86107e16553 100644 --- a/gcc/range-op-float.cc +++ b/gcc/range-op-float.cc @@ -83,10 +83,12 @@ range_operator_float::fold_range (frange &r, tree type, r.set (type, lb, ub); - if (lb_nan || ub_nan || maybe_nan) + if (lb_nan || ub_nan || maybe_nan + || op1.maybe_isnan () + || op2.maybe_isnan ()) // Keep the default NAN (with a varying sign) set by the setter. ; - else if (!op1.maybe_isnan () && !op2.maybe_isnan ()) + else r.clear_nan (); return true;