From patchwork Thu Jan 18 12:31:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 84339 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 5347E385E02C for ; Thu, 18 Jan 2024 12:33:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 5D791385C424 for ; Thu, 18 Jan 2024 12:32:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5D791385C424 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5D791385C424 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705581158; cv=none; b=hEXlvxtX9sOemuFL32Nk0ezbuU3IVAS4PoCNMHWSfC6151ijWaL/wUNrN5Avj+1r2u/B2/neW+iKPUDiWBgjBFaM+4FOr1EjrrHkTsZN23+zcNSFv+cDkplHPv5XLhGzrZ4tQhgfebkLK6iNxHAX5++2v8jmVhSbI/1e1+QEadQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705581158; c=relaxed/simple; bh=HqOWQT25aHrAjOQKMMU+c4XLNaYGTjqXwkwqHCmGMNI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=lfEhJb2ozzx1ijng58Z2TGy1s33lzqLYMgRqKBJgmcXOJ79zNP7VIdxZxx30+XvjZ2z0uTyWy/Fi0OSD6OIrCbMQb87baaeLtB5yrSZDlFTBX5kiCkoObETs8IJP/BCsmbgG4OaXCmTjhm1h5aEi4hW7z/j9BcszEtZA9qnWFZ4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.4.150] (unknown [10.168.4.150]) (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 smtp-out2.suse.de (Postfix) with ESMTPS id 0B1F51FCF2 for ; Thu, 18 Jan 2024 12:32:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1705581154; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=HWIfutM/FF0V1V93lhn5iUzmcYud8mUmv8kUNoFgBTU=; b=ID4q7WUrHFlueAiZUYq9Jeoh1WaRPBkrwFDYzeTuqK5VwGh0f9hOo2ZWePzvSbxHMF0gmo uB6blHhTuiXa1QTSFCmEtrs9xXijO1q+rd7QFgPh9sibgWInavRjIVAv5j7Hz5WGJqqHab XRHcmTZ/vx0YIY8OrLmnkyvJPEMucl4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1705581154; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=HWIfutM/FF0V1V93lhn5iUzmcYud8mUmv8kUNoFgBTU=; b=PBbv+W5ruiimcS+YgpCcCN7YY7fD60vEkB0Sm101BuL/x18zKZqWgSZFFT7MfTAe3fYIB2 uUQZXifpLv0APXCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1705581153; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=HWIfutM/FF0V1V93lhn5iUzmcYud8mUmv8kUNoFgBTU=; b=sIJHp/1qfoFc0Q/CoOWSa7UasHgCx3/J6Qc++Cwti4Qvfe/tq1NAGqnAywBklu+Dtu+8kw E6v0KT6VzChZeSGIs8ZyhmcfeMP/+IbahcIjwxSENi8F+Bmc8n5Y5qmdECCWAN0z0efYnE GRlC2uWi1PvfDZbo2YpfDJWXDuOnq3Q= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1705581153; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=HWIfutM/FF0V1V93lhn5iUzmcYud8mUmv8kUNoFgBTU=; b=WDlhfsZuOxJ3It7e9AD81tEQNSPEYyYjs5KiKQtbdzRHW5eEn+G3i9tkj/pWBI6tgldc78 GYObEGPCA2/WlwCQ== Date: Thu, 18 Jan 2024 13:31:33 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/113475 - fix memory leak in phi_analyzer MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 3.52 X-Spamd-Result: default: False [3.52 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.57)[-0.574]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[gimple-range-phi.cc:url]; NEURAL_SPAM_SHORT(1.70)[0.565]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-0.00)[10.14%] X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Message-Id: <20240118123308.5347E385E02C@sourceware.org> phi_analyzer leaks all phi_group objects it allocates. The following fixes this by maintaining a vector of allocated objects and release them when destroying the phi_analyzer object. Bootstrap and regtest running on x86_64-unknown-linux-gnu. PR tree-optimization/113475 * gimple-range-phi.h (phi_analyzer::m_phi_groups): New. * gimple-range-phi.cc (phi_analyzer::phi_analyzer): Initialize. (phi_analyzer::~phi_analyzer): Deallocate and free collected phi_grous. (phi_analyzer::process_phi): Record allocated phi_groups. --- gcc/gimple-range-phi.cc | 6 +++++- gcc/gimple-range-phi.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/gimple-range-phi.cc b/gcc/gimple-range-phi.cc index 5aee761c6f4..01900a35b32 100644 --- a/gcc/gimple-range-phi.cc +++ b/gcc/gimple-range-phi.cc @@ -254,7 +254,7 @@ phi_group::dump (FILE *f) // Construct a phi analyzer which uses range_query G to pick up values. -phi_analyzer::phi_analyzer (range_query &g) : m_global (g) +phi_analyzer::phi_analyzer (range_query &g) : m_global (g), m_phi_groups (vNULL) { m_work.create (0); m_work.safe_grow (20); @@ -273,6 +273,9 @@ phi_analyzer::~phi_analyzer () bitmap_obstack_release (&m_bitmaps); m_tab.release (); m_work.release (); + for (auto grp : m_phi_groups) + delete grp; + m_phi_groups.release (); } // Return the group, if any, that NAME is part of. Do no analysis. @@ -458,6 +461,7 @@ phi_analyzer::process_phi (gphi *phi) if (!cyc.range ().varying_p ()) { g = new phi_group (cyc); + m_phi_groups.safe_push (g); if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, "PHI ANALYZER : New "); diff --git a/gcc/gimple-range-phi.h b/gcc/gimple-range-phi.h index 04747ba9784..a40aece5b22 100644 --- a/gcc/gimple-range-phi.h +++ b/gcc/gimple-range-phi.h @@ -87,6 +87,7 @@ protected: bitmap m_simple; // Processed, not part of a group. bitmap m_current; // Potential group currently being analyzed. + vec m_phi_groups; vec m_tab; bitmap_obstack m_bitmaps; };