From patchwork Fri Nov 27 13:26:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Hubicka X-Patchwork-Id: 1407210 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ucw.cz 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CjFlD0Mfjz9sSf for ; Sat, 28 Nov 2020 00:26:32 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 66F243972C38; Fri, 27 Nov 2020 13:26:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from nikam.ms.mff.cuni.cz (nikam.ms.mff.cuni.cz [195.113.20.16]) by sourceware.org (Postfix) with ESMTPS id 3B3723972C03 for ; Fri, 27 Nov 2020 13:26:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3B3723972C03 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ucw.cz Authentication-Results: sourceware.org; spf=none smtp.mailfrom=hubicka@kam.mff.cuni.cz Received: by nikam.ms.mff.cuni.cz (Postfix, from userid 16202) id 857F6284604; Fri, 27 Nov 2020 14:26:22 +0100 (CET) Date: Fri, 27 Nov 2020 14:26:22 +0100 From: Jan Hubicka To: Richard Biener Subject: [C++ patch] Re: Free more of CFG in release_function_body Message-ID: <20201127132622.GB78170@kam.mff.cuni.cz> References: <20201124151605.GA56013@kam.mff.cuni.cz> <20201125140838.GA41776@kam.mff.cuni.cz> <20201125143034.GC41776@kam.mff.cuni.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201125143034.GC41776@kam.mff.cuni.cz> User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-14.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Cc: Richard Biener , GCC Patches Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" > > On Wed, Nov 25, 2020 at 3:11 PM Jan Hubicka wrote: > > > > > > > On Tue, 24 Nov 2020, Jan Hubicka wrote: > > > > > > > > > Hi, > > > > > at the end of processing function body we loop over basic blocks and > > > > > free all edges while we do not free the rest. I think this is leftover > > > > > from time eges was not garbage collected and we was not using ggc_free. > > > > > It makes more sense to free all associated structures (which is > > > > > importnat for WPA memory footprint). > > > > > > > > > > Bootstrapped/regtested x86_64-linux, OK? > > > > > > > > OK. > > > > > > Unforutnately the patch does not surive LTO bootstrap. The problem is > > > that we keep DECL_INITIAL that points to blocks and blocks points to > > > var_decls and these points to SSA_NAMES that points to statements and > > > those points to basic blocks. > > > > VAR_DECLs point to SSA_NAMEs? It's the other way around. We for sure > > free SSA_NAMEs (well, maybe not explicitely with ggc_free). > > I am going to debug this more carefully now. I think it was VAR_DECL > with variadic type pointing to SSA_NAME. Should be easy to reduct with > gcac compiler. Hi, it turns out that the pointers to statements leaks through saved scopes in C++ FE. Scopes seems to point to internal blocks of functions even after we finish their compiling. This patch adds code to free pointers. I tried to clear saved_blocks but it breaks since C++ finalization uses them, but it does not look into previous class levels. Patch lto-bootstraps/regtestes x86_64-linux with all languages. OK? Honza * cfg.c (free_block): Call ggc_free on BB itself. * cp-tre.eh (cp_tree_c_finish_parsing): Declare. * semantics.c (finish_translation_unit): Call finish_parsing * tree.c (cp_tree_c_finish_parsing): New function. diff --git a/gcc/cfg.c b/gcc/cfg.c index 529b6ed2105..e8bd1456c9f 100644 --- a/gcc/cfg.c +++ b/gcc/cfg.c @@ -102,8 +102,7 @@ free_block (basic_block bb) bb->succs = NULL; vec_free (bb->preds); bb->preds = NULL; - /* Do not free BB itself yet since we leak pointers to dead statements - that points to dead basic blocks. */ + ggc_free (bb); } /* Free the memory associated with the CFG in FN. */ diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 021de76e142..665d171d9b0 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -7986,6 +7986,8 @@ struct uid_sensitive_constexpr_evaluation_checker bool evaluation_restricted_p () const; }; +void cp_tree_c_finish_parsing (); + /* In cp-ubsan.c */ extern void cp_ubsan_maybe_instrument_member_call (tree); extern void cp_ubsan_instrument_member_accesses (tree *); diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 5ff70ff4844..e9d17c21985 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -3094,6 +3094,7 @@ finish_translation_unit (void) "%<#pragma omp end declare target%>"); scope_chain->omp_declare_target_attribute = 0; } + cp_tree_c_finish_parsing (); } /* Finish a template type parameter, specified as AGGR IDENTIFIER. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 28e591086b3..e63d383c0a3 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -5844,6 +5844,19 @@ maybe_warn_zero_as_null_pointer_constant (tree expr, location_t loc) return false; } +/* Release memory we no longer need after parsing. */ +void +cp_tree_c_finish_parsing () +{ + saved_scope *chain = scope_chain; + while (chain) + { + chain->x_previous_class_level = NULL; + chain = chain->prev; + } + deleted_copy_types = NULL; +} + #if defined ENABLE_TREE_CHECKING && (GCC_VERSION >= 2007) /* Complain that some language-specific thing hanging off a tree node has been accessed improperly. */