From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 221823858C56 for ; Mon, 23 May 2022 19:28:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 221823858C56 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-586-SXzVlYUxMMSw4yOi3SVp-Q-1; Mon, 23 May 2022 15:28:40 -0400 X-MC-Unique: SXzVlYUxMMSw4yOi3SVp-Q-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 2598085A5AA for ; Mon, 23 May 2022 19:28:40 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 010772166B25; Mon, 23 May 2022 19:28:39 +0000 (UTC) From: David Malcolm To: gcc-patches@gcc.gnu.org Subject: [PATCH 07/10] value-relation.h: add 'final' and 'override' to relation_oracle vfunc impls Date: Mon, 23 May 2022 15:28:31 -0400 Message-Id: <20220523192834.3785673-8-dmalcolm@redhat.com> In-Reply-To: <20220523192834.3785673-1-dmalcolm@redhat.com> References: <20220523192834.3785673-1-dmalcolm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.0 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_LOW, 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-List-Received-Date: Mon, 23 May 2022 19:28:43 -0000 gcc/ChangeLog: * value-relation.h: Add "final" and "override" to relation_oracle vfunc implementations as appropriate. Signed-off-by: David Malcolm --- gcc/value-relation.h | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/gcc/value-relation.h b/gcc/value-relation.h index 19762d8ce2b..478729be0bf 100644 --- a/gcc/value-relation.h +++ b/gcc/value-relation.h @@ -130,14 +130,15 @@ public: equiv_oracle (); ~equiv_oracle (); - const_bitmap equiv_set (tree ssa, basic_block bb); + const_bitmap equiv_set (tree ssa, basic_block bb) final override; void register_relation (basic_block bb, relation_kind k, tree ssa1, - tree ssa2); + tree ssa2) override; - relation_kind query_relation (basic_block, tree, tree); - relation_kind query_relation (basic_block, const_bitmap, const_bitmap); - void dump (FILE *f, basic_block bb) const; - void dump (FILE *f) const; + relation_kind query_relation (basic_block, tree, tree) override; + relation_kind query_relation (basic_block, const_bitmap, const_bitmap) + override; + void dump (FILE *f, basic_block bb) const override; + void dump (FILE *f) const override; protected: bitmap_obstack m_bitmaps; @@ -185,14 +186,16 @@ public: dom_oracle (); ~dom_oracle (); - void register_relation (basic_block bb, relation_kind k, tree op1, tree op2); + void register_relation (basic_block bb, relation_kind k, tree op1, tree op2) + final override; - relation_kind query_relation (basic_block bb, tree ssa1, tree ssa2); + relation_kind query_relation (basic_block bb, tree ssa1, tree ssa2) + final override; relation_kind query_relation (basic_block bb, const_bitmap b1, - const_bitmap b2); + const_bitmap b2) final override; - void dump (FILE *f, basic_block bb) const; - void dump (FILE *f) const; + void dump (FILE *f, basic_block bb) const final override; + void dump (FILE *f) const final override; private: bitmap m_tmp, m_tmp2; bitmap m_relation_set; // Index by ssa-name. True if a relation exists @@ -229,15 +232,16 @@ class path_oracle : public relation_oracle public: path_oracle (relation_oracle *oracle = NULL); ~path_oracle (); - const_bitmap equiv_set (tree, basic_block); - void register_relation (basic_block, relation_kind, tree, tree); + const_bitmap equiv_set (tree, basic_block) final override; + void register_relation (basic_block, relation_kind, tree, tree) final override; void killing_def (tree); - relation_kind query_relation (basic_block, tree, tree); - relation_kind query_relation (basic_block, const_bitmap, const_bitmap); + relation_kind query_relation (basic_block, tree, tree) final override; + relation_kind query_relation (basic_block, const_bitmap, const_bitmap) + final override; void reset_path (); void set_root_oracle (relation_oracle *oracle) { m_root = oracle; } - void dump (FILE *, basic_block) const; - void dump (FILE *) const; + void dump (FILE *, basic_block) const final override; + void dump (FILE *) const final override; private: void register_equiv (basic_block bb, tree ssa1, tree ssa2); equiv_chain m_equiv; -- 2.26.3