From patchwork Mon May 23 19:28:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Malcolm X-Patchwork-Id: 54313 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5DC123858C2D for ; Mon, 23 May 2022 19:31:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DC123858C2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1653334262; bh=rRIwmmr1biE/Cyei3yxLqlygGIriRZr9oZu4oDjMTlE=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=ntWYvgzQXOO9No1/o66q/QS0JuVAmc4xwtAM4mgaWurFNevEDpojXXKOXdnhVckSm /1YvszylxK+HAu6fggzsl5SjUtDv6P5Z9rPkuRGR6VO3kTSD0Gy2MGwBXk0ZunG2t1 6SDXCv4+PTQxrERykc7yB7cgzjwl82ws5OpDDkr4= 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 E2EB63858C53 for ; Mon, 23 May 2022 19:28:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E2EB63858C53 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-82-QdvA6IAxOGmKTG74hWmnKw-1; Mon, 23 May 2022 15:28:39 -0400 X-MC-Unique: QdvA6IAxOGmKTG74hWmnKw-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 17100811E75 for ; Mon, 23 May 2022 19:28:39 +0000 (UTC) Received: from t14s.localdomain.com (unknown [10.2.17.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id E80372166B25; Mon, 23 May 2022 19:28:38 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH 02/10] Add 'final' and 'override' on dom_walker vfunc impls Date: Mon, 23 May 2022 15:28:26 -0400 Message-Id: <20220523192834.3785673-3-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 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-Patchwork-Original-From: David Malcolm via Gcc-patches From: David Malcolm Reply-To: David Malcolm Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" gcc/ChangeLog: * compare-elim.cc: Add "final" and "override" to dom_walker vfunc implementations, removing redundant "virtual" as appropriate. * gimple-ssa-strength-reduction.cc: Likewise. * ipa-prop.cc: Likewise. * rtl-ssa/blocks.cc: Likewise. * tree-into-ssa.cc: Likewise. * tree-ssa-dom.cc: Likewise. * tree-ssa-math-opts.cc: Likewise. * tree-ssa-phiopt.cc: Likewise. * tree-ssa-propagate.cc: Likewise. * tree-ssa-sccvn.cc: Likewise. * tree-ssa-strlen.cc: Likewise. * tree-ssa-uncprop.cc: Likewise. Signed-off-by: David Malcolm --- gcc/compare-elim.cc | 2 +- gcc/gimple-ssa-strength-reduction.cc | 2 +- gcc/ipa-prop.cc | 4 ++-- gcc/rtl-ssa/blocks.cc | 4 ++-- gcc/tree-into-ssa.cc | 10 +++++----- gcc/tree-ssa-dom.cc | 4 ++-- gcc/tree-ssa-math-opts.cc | 2 +- gcc/tree-ssa-phiopt.cc | 4 ++-- gcc/tree-ssa-propagate.cc | 4 ++-- gcc/tree-ssa-sccvn.cc | 4 ++-- gcc/tree-ssa-strlen.cc | 4 ++-- gcc/tree-ssa-uncprop.cc | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gcc/compare-elim.cc b/gcc/compare-elim.cc index e869d9d3249..4a23202f8ff 100644 --- a/gcc/compare-elim.cc +++ b/gcc/compare-elim.cc @@ -283,7 +283,7 @@ public: find_comparison_dom_walker (cdi_direction direction) : dom_walker (direction) {} - virtual edge before_dom_children (basic_block); + edge before_dom_children (basic_block) final override; }; /* Return true if conforming COMPARE with EH_NOTE is redundant with comparison diff --git a/gcc/gimple-ssa-strength-reduction.cc b/gcc/gimple-ssa-strength-reduction.cc index 2b559e96fc8..fb2bb9f4e74 100644 --- a/gcc/gimple-ssa-strength-reduction.cc +++ b/gcc/gimple-ssa-strength-reduction.cc @@ -1729,7 +1729,7 @@ class find_candidates_dom_walker : public dom_walker public: find_candidates_dom_walker (cdi_direction direction) : dom_walker (direction) {} - virtual edge before_dom_children (basic_block); + edge before_dom_children (basic_block) final override; }; /* Find strength-reduction candidates in block BB. */ diff --git a/gcc/ipa-prop.cc b/gcc/ipa-prop.cc index c6c745f84a0..03f0ba2ec75 100644 --- a/gcc/ipa-prop.cc +++ b/gcc/ipa-prop.cc @@ -3004,7 +3004,7 @@ public: analysis_dom_walker (struct ipa_func_body_info *fbi) : dom_walker (CDI_DOMINATORS), m_fbi (fbi) {} - virtual edge before_dom_children (basic_block); + edge before_dom_children (basic_block) final override; private: struct ipa_func_body_info *m_fbi; @@ -5653,7 +5653,7 @@ public: : dom_walker (CDI_DOMINATORS), m_fbi (fbi), m_descriptors (descs), m_aggval (av), m_something_changed (sc) {} - virtual edge before_dom_children (basic_block); + edge before_dom_children (basic_block) final override; bool cleanup_eh () { return gimple_purge_all_dead_eh_edges (m_need_eh_cleanup); } diff --git a/gcc/rtl-ssa/blocks.cc b/gcc/rtl-ssa/blocks.cc index 959fad8f829..6b03dd03747 100644 --- a/gcc/rtl-ssa/blocks.cc +++ b/gcc/rtl-ssa/blocks.cc @@ -85,8 +85,8 @@ class function_info::bb_walker : public dom_walker { public: bb_walker (function_info *, build_info &); - virtual edge before_dom_children (basic_block); - virtual void after_dom_children (basic_block); + edge before_dom_children (basic_block) final override; + void after_dom_children (basic_block) final override; private: // Information about the function we're building. diff --git a/gcc/tree-into-ssa.cc b/gcc/tree-into-ssa.cc index 46df57ae0e1..9631d8c6556 100644 --- a/gcc/tree-into-ssa.cc +++ b/gcc/tree-into-ssa.cc @@ -1462,8 +1462,8 @@ public: rewrite_dom_walker (cdi_direction direction) : dom_walker (direction, ALL_BLOCKS, NULL) {} - virtual edge before_dom_children (basic_block); - virtual void after_dom_children (basic_block); + edge before_dom_children (basic_block) final override; + void after_dom_children (basic_block) final override; }; /* SSA Rewriting Step 1. Initialization, create a block local stack @@ -2148,8 +2148,8 @@ public: rewrite_update_dom_walker (cdi_direction direction) : dom_walker (direction, ALL_BLOCKS, NULL) {} - virtual edge before_dom_children (basic_block); - virtual void after_dom_children (basic_block); + edge before_dom_children (basic_block) final override; + void after_dom_children (basic_block) final override; }; /* Initialization of block data structures for the incremental SSA @@ -2300,7 +2300,7 @@ public: mark_def_dom_walker (cdi_direction direction); ~mark_def_dom_walker (); - virtual edge before_dom_children (basic_block); + edge before_dom_children (basic_block) final override; private: /* Notice that this bitmap is indexed using variable UIDs, so it must be diff --git a/gcc/tree-ssa-dom.cc b/gcc/tree-ssa-dom.cc index 97e17ca68e4..1a44b10756f 100644 --- a/gcc/tree-ssa-dom.cc +++ b/gcc/tree-ssa-dom.cc @@ -737,8 +737,8 @@ public: m_threader = threader; } - virtual edge before_dom_children (basic_block); - virtual void after_dom_children (basic_block); + edge before_dom_children (basic_block) final override; + void after_dom_children (basic_block) final override; private: diff --git a/gcc/tree-ssa-math-opts.cc b/gcc/tree-ssa-math-opts.cc index fe9f37b4cd4..a4492c96419 100644 --- a/gcc/tree-ssa-math-opts.cc +++ b/gcc/tree-ssa-math-opts.cc @@ -4918,7 +4918,7 @@ public: /* The actual actions performed in the walk. */ - virtual void after_dom_children (basic_block); + void after_dom_children (basic_block) final override; /* Set of results of chains of multiply and add statement combinations that were not transformed into FMAs because of active deferring. */ diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc index 162ca7098cd..d17c49468db 100644 --- a/gcc/tree-ssa-phiopt.cc +++ b/gcc/tree-ssa-phiopt.cc @@ -2978,8 +2978,8 @@ public: : dom_walker (direction), m_nontrapping (ps), m_seen_refs (128) {} - virtual edge before_dom_children (basic_block); - virtual void after_dom_children (basic_block); + edge before_dom_children (basic_block) final override; + void after_dom_children (basic_block) final override; private: diff --git a/gcc/tree-ssa-propagate.cc b/gcc/tree-ssa-propagate.cc index c10ffd91766..d2d32517a8c 100644 --- a/gcc/tree-ssa-propagate.cc +++ b/gcc/tree-ssa-propagate.cc @@ -679,8 +679,8 @@ public: BITMAP_FREE (need_eh_cleanup); } - virtual edge before_dom_children (basic_block); - virtual void after_dom_children (basic_block bb) + edge before_dom_children (basic_block) final override; + void after_dom_children (basic_block bb) final override { substitute_and_fold_engine->post_fold_bb (bb); } diff --git a/gcc/tree-ssa-sccvn.cc b/gcc/tree-ssa-sccvn.cc index 18392e031b8..7407591e98c 100644 --- a/gcc/tree-ssa-sccvn.cc +++ b/gcc/tree-ssa-sccvn.cc @@ -2493,8 +2493,8 @@ public: eliminate_dom_walker (cdi_direction, bitmap); ~eliminate_dom_walker (); - virtual edge before_dom_children (basic_block); - virtual void after_dom_children (basic_block); + edge before_dom_children (basic_block) final override; + void after_dom_children (basic_block) final override; virtual tree eliminate_avail (basic_block, tree op); virtual void eliminate_push_avail (basic_block, tree op); diff --git a/gcc/tree-ssa-strlen.cc b/gcc/tree-ssa-strlen.cc index 2cceba6f7af..7b3e3899ea2 100644 --- a/gcc/tree-ssa-strlen.cc +++ b/gcc/tree-ssa-strlen.cc @@ -243,8 +243,8 @@ public: ~strlen_pass (); - virtual edge before_dom_children (basic_block); - virtual void after_dom_children (basic_block); + edge before_dom_children (basic_block) final override; + void after_dom_children (basic_block) final override; bool check_and_optimize_stmt (bool *cleanup_eh); bool check_and_optimize_call (bool *zero_write); diff --git a/gcc/tree-ssa-uncprop.cc b/gcc/tree-ssa-uncprop.cc index 510f8319d8c..900bf336e2e 100644 --- a/gcc/tree-ssa-uncprop.cc +++ b/gcc/tree-ssa-uncprop.cc @@ -298,8 +298,8 @@ class uncprop_dom_walker : public dom_walker public: uncprop_dom_walker (cdi_direction direction) : dom_walker (direction) {} - virtual edge before_dom_children (basic_block); - virtual void after_dom_children (basic_block); + edge before_dom_children (basic_block) final override; + void after_dom_children (basic_block) final override; private: