From 895a2138265fd9cace3588404523122f73626d2a Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 18 Jan 2024 13:23:27 +0100 Subject: [PATCH] tree-optimization/113475 - fix memory leak in phi_analyzer 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. 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; };