From patchwork Tue Apr 18 05:33:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 84579 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2598749vqo; Mon, 17 Apr 2023 22:34:10 -0700 (PDT) X-Google-Smtp-Source: AKy350b8qH5JepPdd8STPwcr2lSUWK0ih9rz2rJ/Y40DY2XgHGo6c1l2vvtmogk9SyRc2ijzZ/Qh X-Received: by 2002:a17:906:4a0f:b0:94e:d664:c2d5 with SMTP id w15-20020a1709064a0f00b0094ed664c2d5mr10449881eju.21.1681796050654; Mon, 17 Apr 2023 22:34:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681796050; cv=none; d=google.com; s=arc-20160816; b=M77c9+eoyx/EMu3JkEKGFvXQROrYUAy7bGwmnikcF4WJ8gAOoeMtqHOvVqbvBhwzWj yTDwHA6LPXP/Zp+3rMIJ7v9iLgf2qJf1WO/DYe5gr7Fj9okWtdVM97m4QJ+ZxSvfCDvl WBLwUtK3pREZG3svcrRLwdbWYf8y5/tqvpzezmKnt1UdbYlinUYqNI2cSMs/jngCIAvB 9WLCfqj+prLsX6NmEk1CDwqCKySfwHBjrGFvcRHTOA3ZEn/iF4GETB7Aylk9qtnJSYUQ dngrIZlabPJQH95pj3GT+7MsXB7ypbWTXebdYykwXWIbOfXJGuWNJjFEQOWWHhEkqyue gVPw== 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=Y8DOTzqh7mn7tE4ZKT4X9zV3YRz78KHHP08i8KsJ+oc=; b=W1w0HzxtuioCpIuzQFSJ1Mt2TDLRE/zKiGs6LFdw0ajMlXt4Qjq2pAi+ndmcAbhOox 1s0bc2pYaXWvZNBrvQG/LkFIb/p018z0WecsfjFbgRgftg5l2adgC0SHimmwunnkJhVX qCUtOOsvYCaIUFpgXSCFtX9BSeyELov6KFqqVNu0UQyD1xWC+3HfK7ZO6v5vdT63GjPR 9gaU+H/x5dcUFWbPvz8Cw4nKLmz/9XtIs98682UNTe51KWvqoMPcANhOP/RsV8to73aF NFTVDoE/RbAlsGiEuuyUjmtksAXS7nOD6EZ4oEMrM6mRjPea9LW6J/DaAPVFA3cdIX5P EuKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="t/mDDbYM"; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id g16-20020a170906521000b0094a511ab44dsi11192630ejm.617.2023.04.17.22.34.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 22:34:10 -0700 (PDT) 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=@gcc.gnu.org header.s=default header.b="t/mDDbYM"; 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"; 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 511A93858D35 for ; Tue, 18 Apr 2023 05:34:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 511A93858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681796049; bh=Y8DOTzqh7mn7tE4ZKT4X9zV3YRz78KHHP08i8KsJ+oc=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=t/mDDbYMEF1hYCpHP2kWY1NPH3zpvfPZE42SU4Q0SHa53Xg1hgyX/OozYabb44U4M /XSlPh1+uTs3Dp9D/JxLpQ+x5YCo12spdxfzb9+6hmi0ic8P/NF5d7oheP3m/wX0XP VtRHAHX6Y1WqtiH5madEP3fO560E8wJUc5ymBdfY= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id E07D23858D28 for ; Tue, 18 Apr 2023 05:33:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E07D23858D28 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-647-RmQ5vXbNOLau4DYibSiHQA-1; Tue, 18 Apr 2023 01:33:19 -0400 X-MC-Unique: RmQ5vXbNOLau4DYibSiHQA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 496A285A5A3 for ; Tue, 18 Apr 2023 05:33:19 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.192.92]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D6BB840C6E6F; Tue, 18 Apr 2023 05:33:18 +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 33I5XGao222572 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 18 Apr 2023 07:33:16 +0200 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.17.1/8.17.1/Submit) id 33I5XGIE222571; Tue, 18 Apr 2023 07:33:16 +0200 To: GCC patches Cc: Andrew MacLeod , Aldy Hernandez Subject: [COMMITTED] Constify invariant fields of vrange and irange. Date: Tue, 18 Apr 2023 07:33:14 +0200 Message-Id: <20230418053314.222548-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.3 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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763490975747104432?= X-GMAIL-MSGID: =?utf-8?q?1763490975747104432?= The discriminator in vrange cannot change after construction, similarly the number of allocated ranges in an irange. It's best to make them constant to avoid invalid changes. gcc/ChangeLog: * value-range.h (class vrange): Make m_discriminator const. (class irange): Make m_max_ranges const. Adjust constructors accordingly. (class unsupported_range): Construct vrange appropriately. (class frange): Same. --- gcc/value-range.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gcc/value-range.h b/gcc/value-range.h index 969b2b68418..e9439bb7d3c 100644 --- a/gcc/value-range.h +++ b/gcc/value-range.h @@ -104,8 +104,9 @@ public: enum value_range_kind kind () const; // DEPRECATED protected: + vrange (enum value_range_discriminator d) : m_discriminator (d) { } ENUM_BITFIELD(value_range_kind) m_kind : 8; - ENUM_BITFIELD(value_range_discriminator) m_discriminator : 4; + const ENUM_BITFIELD(value_range_discriminator) m_discriminator : 4; }; // An integer range without any storage. @@ -214,7 +215,7 @@ private: bool intersect (const wide_int& lb, const wide_int& ub); unsigned char m_num_ranges; - unsigned char m_max_ranges; + const unsigned char m_max_ranges; tree m_nonzero_mask; tree *m_base; }; @@ -257,8 +258,8 @@ class unsupported_range : public vrange { public: unsupported_range () + : vrange (VR_UNKNOWN) { - m_discriminator = VR_UNKNOWN; set_undefined (); } virtual void set_undefined () final override @@ -873,10 +874,10 @@ gt_pch_nx (int_range *x, gt_pointer_operator op, void *cookie) inline irange::irange (tree *base, unsigned nranges) + : vrange (VR_IRANGE), + m_max_ranges (nranges) { - m_discriminator = VR_IRANGE; m_base = base; - m_max_ranges = nranges; set_undefined (); } @@ -1112,22 +1113,22 @@ vrp_val_min (const_tree type) inline frange::frange () + : vrange (VR_FRANGE) { - m_discriminator = VR_FRANGE; set_undefined (); } inline frange::frange (const frange &src) + : vrange (VR_FRANGE) { - m_discriminator = VR_FRANGE; *this = src; } inline frange::frange (tree type) + : vrange (VR_FRANGE) { - m_discriminator = VR_FRANGE; set_varying (type); } @@ -1137,8 +1138,8 @@ inline frange::frange (tree type, const REAL_VALUE_TYPE &min, const REAL_VALUE_TYPE &max, value_range_kind kind) + : vrange (VR_FRANGE) { - m_discriminator = VR_FRANGE; set (type, min, max, kind); } @@ -1146,8 +1147,8 @@ frange::frange (tree type, inline frange::frange (tree min, tree max, value_range_kind kind) + : vrange (VR_FRANGE) { - m_discriminator = VR_FRANGE; set (min, max, kind); }