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: 1769937 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=Ybd4bjU2; 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 4Q0szJ3F7Jz1ybC for ; Tue, 18 Apr 2023 15:33:46 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C16D5385840D for ; Tue, 18 Apr 2023 05:33:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C16D5385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681796023; 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=Ybd4bjU2OQbF8tUKKLaHXXH2TW7/9DYKQ80CD2uBfrWO+FqZ2xnA/zy4DC0JcSW6D uPaRe3mYO/s3L5rgunyQR0BRVMBlUGdm+FuK+kbT8alUgGIoTB2MfMpoct4FuSeK0N 87Z6o405/OpeTdPTQW18T+mMSAkl54etxolKkEAg= 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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); }