From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id C9F9E3858407 for ; Tue, 24 May 2022 07:36:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C9F9E3858407 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 8BB431F8B8; Tue, 24 May 2022 07:36:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1653377789; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yeDaAuiHhrccUkqdie9SKgVMXneZlWjiQ69Vo1ey7ck=; b=b5oL+tgol4SRPLgUtzkH4yWCiOgyIiEYMtYzCuYnllTBPlo/2d+EFwTfEaf8UnlgU1iF2F laZuYV3LO1hpUggriVeaeFiV7wd9HVOVwaydiuI2Y3wcmqh/jtVLPU2LfSMOtj1cdtck+O pP/Qdd2MMpStGKKmOmUyjafINJy9bdA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1653377789; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yeDaAuiHhrccUkqdie9SKgVMXneZlWjiQ69Vo1ey7ck=; b=u6BOzIfACM3RtEtslIH+TMx8u8xZUNhoi2HoZR1kQE5XfZFNeep/RiSKYekmPYv4ZjTc3m QmCTTDsfb/LtthDw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 753B213ADF; Tue, 24 May 2022 07:36:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id dMOfG/2KjGJ1TAAAMHmgww (envelope-from ); Tue, 24 May 2022 07:36:29 +0000 Message-ID: <8a0c5b4c-5f6c-7df5-be87-a98f70ae3b31@suse.cz> Date: Tue, 24 May 2022 09:36:29 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [PATCH 06/10] ipa: add 'final' and 'override' to call_summary_base vfunc impls Content-Language: en-US To: David Malcolm , gcc-patches@gcc.gnu.org References: <20220523192834.3785673-1-dmalcolm@redhat.com> <20220523192834.3785673-7-dmalcolm@redhat.com> From: =?UTF-8?Q?Martin_Li=c5=a1ka?= In-Reply-To: <20220523192834.3785673-7-dmalcolm@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, SPF_HELO_NONE, SPF_PASS, 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: Tue, 24 May 2022 07:36:33 -0000 On 5/23/22 21:28, David Malcolm via Gcc-patches wrote: > gcc/ChangeLog: > * ipa-cp.cc: Add "final" and "override" to call_summary_base vfunc > implementations, removing redundant "virtual" as appropriate. > * ipa-fnsummary.h: Likewise. > * ipa-modref.cc: Likewise. > * ipa-param-manipulation.cc: Likewise. > * ipa-profile.cc: Likewise. > * ipa-prop.h: Likewise. > * ipa-pure-const.cc: Likewise. > * ipa-reference.cc: Likewise. > * ipa-sra.cc: Likewise. > * symbol-summary.h: Likewise. > * symtab-thunks.cc: Likewise. > > Signed-off-by: David Malcolm Ok. Martin > --- > gcc/ipa-cp.cc | 6 +++--- > gcc/ipa-fnsummary.h | 21 ++++++++++---------- > gcc/ipa-modref.cc | 36 +++++++++++++++++------------------ > gcc/ipa-param-manipulation.cc | 8 ++++---- > gcc/ipa-profile.cc | 6 +++--- > gcc/ipa-prop.h | 26 ++++++++++++------------- > gcc/ipa-pure-const.cc | 8 ++++---- > gcc/ipa-reference.cc | 10 +++++----- > gcc/ipa-sra.cc | 14 +++++++------- > gcc/symbol-summary.h | 8 ++++---- > gcc/symtab-thunks.cc | 8 ++++---- > 11 files changed, 76 insertions(+), 75 deletions(-) > > diff --git a/gcc/ipa-cp.cc b/gcc/ipa-cp.cc > index 38a21b17e39..bb2d611cbcd 100644 > --- a/gcc/ipa-cp.cc > +++ b/gcc/ipa-cp.cc > @@ -4190,9 +4190,9 @@ public: > m_initialize_when_cloning = true; > } > > - virtual void duplicate (cgraph_edge *src_edge, cgraph_edge *dst_edge, > - edge_clone_summary *src_data, > - edge_clone_summary *dst_data); > + void duplicate (cgraph_edge *src_edge, cgraph_edge *dst_edge, > + edge_clone_summary *src_data, > + edge_clone_summary *dst_data) final override; > }; > > /* Edge duplication hook. */ > diff --git a/gcc/ipa-fnsummary.h b/gcc/ipa-fnsummary.h > index e1f1d1b839c..941fea6de0d 100644 > --- a/gcc/ipa-fnsummary.h > +++ b/gcc/ipa-fnsummary.h > @@ -236,14 +236,15 @@ public: > /* Remove ipa_fn_summary for all callees of NODE. */ > void remove_callees (cgraph_node *node); > > - virtual void insert (cgraph_node *, ipa_fn_summary *); > - virtual void remove (cgraph_node *node, ipa_fn_summary *) > + void insert (cgraph_node *, ipa_fn_summary *) final override; > + void remove (cgraph_node *node, ipa_fn_summary *) final override > { > remove_callees (node); > } > > - virtual void duplicate (cgraph_node *src, cgraph_node *dst, > - ipa_fn_summary *src_data, ipa_fn_summary *dst_data); > + void duplicate (cgraph_node *src, cgraph_node *dst, > + ipa_fn_summary *src_data, ipa_fn_summary *dst_data) > + final override; > }; > > extern GTY(()) fast_function_summary > @@ -259,9 +260,9 @@ public: > disable_insertion_hook (); > } > > - virtual void duplicate (cgraph_node *, cgraph_node *, > - ipa_size_summary *src_data, > - ipa_size_summary *dst_data) > + void duplicate (cgraph_node *, cgraph_node *, > + ipa_size_summary *src_data, > + ipa_size_summary *dst_data) final override > { > *dst_data = *src_data; > } > @@ -311,9 +312,9 @@ public: > fast_call_summary (symtab) {} > > /* Hook that is called by summary when an edge is duplicated. */ > - virtual void duplicate (cgraph_edge *src, cgraph_edge *dst, > - ipa_call_summary *src_data, > - ipa_call_summary *dst_data); > + void duplicate (cgraph_edge *src, cgraph_edge *dst, > + ipa_call_summary *src_data, > + ipa_call_summary *dst_data) final override; > }; > > /* Estimated execution times, code sizes and other information about the > diff --git a/gcc/ipa-modref.cc b/gcc/ipa-modref.cc > index 7c1f974bc7a..0d9abacf0a6 100644 > --- a/gcc/ipa-modref.cc > +++ b/gcc/ipa-modref.cc > @@ -119,10 +119,10 @@ public: > fnspec_summaries_t (symbol_table *symtab) > : call_summary (symtab) {} > /* Hook that is called by summary when an edge is duplicated. */ > - virtual void duplicate (cgraph_edge *, > - cgraph_edge *, > - fnspec_summary *src, > - fnspec_summary *dst) > + void duplicate (cgraph_edge *, > + cgraph_edge *, > + fnspec_summary *src, > + fnspec_summary *dst) final override > { > dst->fnspec = xstrdup (src->fnspec); > } > @@ -194,10 +194,10 @@ public: > escape_summaries_t (symbol_table *symtab) > : call_summary (symtab) {} > /* Hook that is called by summary when an edge is duplicated. */ > - virtual void duplicate (cgraph_edge *, > - cgraph_edge *, > - escape_summary *src, > - escape_summary *dst) > + void duplicate (cgraph_edge *, > + cgraph_edge *, > + escape_summary *src, > + escape_summary *dst) final override > { > dst->esc = src->esc.copy (); > } > @@ -217,11 +217,11 @@ class GTY((user)) modref_summaries > public: > modref_summaries (symbol_table *symtab) > : fast_function_summary (symtab) {} > - virtual void insert (cgraph_node *, modref_summary *state); > - virtual void duplicate (cgraph_node *src_node, > - cgraph_node *dst_node, > - modref_summary *src_data, > - modref_summary *dst_data); > + void insert (cgraph_node *, modref_summary *state) final override; > + void duplicate (cgraph_node *src_node, > + cgraph_node *dst_node, > + modref_summary *src_data, > + modref_summary *dst_data) final override; > static modref_summaries *create_ggc (symbol_table *symtab) > { > return new (ggc_alloc_no_dtor ()) > @@ -241,11 +241,11 @@ public: > modref_summaries_lto (symbol_table *symtab) > : fast_function_summary (symtab), > propagated (false) {} > - virtual void insert (cgraph_node *, modref_summary_lto *state); > - virtual void duplicate (cgraph_node *src_node, > - cgraph_node *dst_node, > - modref_summary_lto *src_data, > - modref_summary_lto *dst_data); > + void insert (cgraph_node *, modref_summary_lto *state) final override; > + void duplicate (cgraph_node *src_node, > + cgraph_node *dst_node, > + modref_summary_lto *src_data, > + modref_summary_lto *dst_data) final override; > static modref_summaries_lto *create_ggc (symbol_table *symtab) > { > return new (ggc_alloc_no_dtor ()) > diff --git a/gcc/ipa-param-manipulation.cc b/gcc/ipa-param-manipulation.cc > index 38328c3e8d0..23a8cb84d48 100644 > --- a/gcc/ipa-param-manipulation.cc > +++ b/gcc/ipa-param-manipulation.cc > @@ -114,10 +114,10 @@ class ipa_edge_modification_sum > > /* Hook that is called by summary when an edge is duplicated. */ > > - virtual void duplicate (cgraph_edge *, > - cgraph_edge *, > - ipa_edge_modification_info *old_info, > - ipa_edge_modification_info *new_info) > + void duplicate (cgraph_edge *, > + cgraph_edge *, > + ipa_edge_modification_info *old_info, > + ipa_edge_modification_info *new_info) final override > { > new_info->index_map.safe_splice (old_info->index_map); > new_info->pass_through_map.safe_splice (old_info->pass_through_map); > diff --git a/gcc/ipa-profile.cc b/gcc/ipa-profile.cc > index 496f292acba..e0acc5d0188 100644 > --- a/gcc/ipa-profile.cc > +++ b/gcc/ipa-profile.cc > @@ -198,9 +198,9 @@ public: > {} > > /* Duplicate info when an edge is cloned. */ > - virtual void duplicate (cgraph_edge *, cgraph_edge *, > - speculative_call_summary *old_sum, > - speculative_call_summary *new_sum); > + void duplicate (cgraph_edge *, cgraph_edge *, > + speculative_call_summary *old_sum, > + speculative_call_summary *new_sum) final override; > }; > > static ipa_profile_call_summaries *call_sums = NULL; > diff --git a/gcc/ipa-prop.h b/gcc/ipa-prop.h > index b22dfb5315c..8811e0ea987 100644 > --- a/gcc/ipa-prop.h > +++ b/gcc/ipa-prop.h > @@ -1004,10 +1004,10 @@ public: > } > > /* Hook that is called by summary when a node is duplicated. */ > - virtual void duplicate (cgraph_node *node, > - cgraph_node *node2, > - ipa_node_params *data, > - ipa_node_params *data2); > + void duplicate (cgraph_node *node, > + cgraph_node *node2, > + ipa_node_params *data, > + ipa_node_params *data2) final override; > }; > > /* Summary to manange ipa_edge_args structures. */ > @@ -1024,12 +1024,12 @@ class GTY((user)) ipa_edge_args_sum_t : public call_summary > } > > /* Hook that is called by summary when an edge is removed. */ > - virtual void remove (cgraph_edge *cs, ipa_edge_args *args); > + void remove (cgraph_edge *cs, ipa_edge_args *args) final override; > /* Hook that is called by summary when an edge is duplicated. */ > - virtual void duplicate (cgraph_edge *src, > - cgraph_edge *dst, > - ipa_edge_args *old_args, > - ipa_edge_args *new_args); > + void duplicate (cgraph_edge *src, > + cgraph_edge *dst, > + ipa_edge_args *old_args, > + ipa_edge_args *new_args) final override; > }; > > /* Function summary where the parameter infos are actually stored. */ > @@ -1055,10 +1055,10 @@ public: > return summary; > } > /* Hook that is called by summary when a node is duplicated. */ > - virtual void duplicate (cgraph_node *node, > - cgraph_node *node2, > - ipcp_transformation *data, > - ipcp_transformation *data2); > + void duplicate (cgraph_node *node, > + cgraph_node *node2, > + ipcp_transformation *data, > + ipcp_transformation *data2) final override; > }; > > /* Function summary where the IPA CP transformations are actually stored. */ > diff --git a/gcc/ipa-pure-const.cc b/gcc/ipa-pure-const.cc > index 0e55fc4bfc5..572a6da274f 100644 > --- a/gcc/ipa-pure-const.cc > +++ b/gcc/ipa-pure-const.cc > @@ -137,10 +137,10 @@ public: > funct_state_summary_t (symbol_table *symtab): > fast_function_summary (symtab) {} > > - virtual void insert (cgraph_node *, funct_state_d *state); > - virtual void duplicate (cgraph_node *src_node, cgraph_node *dst_node, > - funct_state_d *src_data, > - funct_state_d *dst_data); > + void insert (cgraph_node *, funct_state_d *state) final override; > + void duplicate (cgraph_node *src_node, cgraph_node *dst_node, > + funct_state_d *src_data, > + funct_state_d *dst_data) final override; > }; > > static funct_state_summary_t *funct_state_summaries = NULL; > diff --git a/gcc/ipa-reference.cc b/gcc/ipa-reference.cc > index b5a2350ce72..bd6ee0d8c57 100644 > --- a/gcc/ipa-reference.cc > +++ b/gcc/ipa-reference.cc > @@ -133,11 +133,11 @@ public: > ipa_ref_opt_summary_t (symbol_table *symtab): > fast_function_summary (symtab) {} > > - virtual void remove (cgraph_node *src_node, > - ipa_reference_optimization_summary_d *data); > - virtual void duplicate (cgraph_node *src_node, cgraph_node *dst_node, > - ipa_reference_optimization_summary_d *src_data, > - ipa_reference_optimization_summary_d *dst_data); > + void remove (cgraph_node *src_node, > + ipa_reference_optimization_summary_d *data) final override; > + void duplicate (cgraph_node *src_node, cgraph_node *dst_node, > + ipa_reference_optimization_summary_d *src_data, > + ipa_reference_optimization_summary_d *dst_data) final override; > }; > > static ipa_ref_opt_summary_t *ipa_ref_opt_sum_summaries = NULL; > diff --git a/gcc/ipa-sra.cc b/gcc/ipa-sra.cc > index 4f705a3febf..2237ac6d92f 100644 > --- a/gcc/ipa-sra.cc > +++ b/gcc/ipa-sra.cc > @@ -376,10 +376,10 @@ public: > ipa_sra_function_summaries (symbol_table *table, bool ggc): > function_summary (table, ggc) { } > > - virtual void duplicate (cgraph_node *, cgraph_node *, > - isra_func_summary *old_sum, > - isra_func_summary *new_sum); > - virtual void insert (cgraph_node *, isra_func_summary *); > + void duplicate (cgraph_node *, cgraph_node *, > + isra_func_summary *old_sum, > + isra_func_summary *new_sum) final override; > + void insert (cgraph_node *, isra_func_summary *) final override; > }; > > /* Hook that is called by summary when a node is duplicated. */ > @@ -458,9 +458,9 @@ public: > call_summary (table) { } > > /* Duplicate info when an edge is cloned. */ > - virtual void duplicate (cgraph_edge *, cgraph_edge *, > - isra_call_summary *old_sum, > - isra_call_summary *new_sum); > + void duplicate (cgraph_edge *, cgraph_edge *, > + isra_call_summary *old_sum, > + isra_call_summary *new_sum) final override; > }; > > static ipa_sra_call_summaries *call_sums; > diff --git a/gcc/symbol-summary.h b/gcc/symbol-summary.h > index c54d3084cc4..45fa250e3f9 100644 > --- a/gcc/symbol-summary.h > +++ b/gcc/symbol-summary.h > @@ -248,7 +248,7 @@ protected: > > private: > /* Indication if we use ggc summary. */ > - virtual bool is_ggc () > + bool is_ggc () final override > { > return m_ggc; > } > @@ -439,7 +439,7 @@ public: > void *data); > > private: > - virtual bool is_ggc (); > + bool is_ggc () final override; > > /* Summary is stored in the vector. */ > vec *m_vector; > @@ -744,7 +744,7 @@ protected: > > private: > /* Indication if we use ggc summary. */ > - virtual bool is_ggc () > + bool is_ggc () final override > { > return m_ggc; > } > @@ -910,7 +910,7 @@ public: > void *data); > > private: > - virtual bool is_ggc (); > + bool is_ggc () final override; > > /* Summary is stored in the vector. */ > vec *m_vector; > diff --git a/gcc/symtab-thunks.cc b/gcc/symtab-thunks.cc > index 73f810dc217..b1d9c5ddb53 100644 > --- a/gcc/symtab-thunks.cc > +++ b/gcc/symtab-thunks.cc > @@ -71,10 +71,10 @@ public: > function_summary (table, ggc) { } > > /* Hook that is called by summary when a node is duplicated. */ > - virtual void duplicate (cgraph_node *node, > - cgraph_node *node2, > - thunk_info *data, > - thunk_info *data2); > + void duplicate (cgraph_node *node, > + cgraph_node *node2, > + thunk_info *data, > + thunk_info *data2) final override; > }; > > /* Duplication hook. */