From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 5697E3858416; Thu, 28 Oct 2021 21:38:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5697E3858416 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from gluon.fritz.box ([79.251.15.9]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1M7sHy-1mbFI00NBC-0052cx; Thu, 28 Oct 2021 23:38:10 +0200 Subject: Re: [PATCH,FORTRAN] Fix memory leak of gsymbol To: Bernhard Reutner-Fischer , fortran@gcc.gnu.org Cc: gcc-patches@gcc.gnu.org Newsgroups: gmane.comp.gcc.patches,gmane.comp.gcc.fortran References: <20181021140434.30743-1-rep.dot.nop@gmail.com> <20211027234320.16fc848b@nbbrfq> From: Harald Anlauf Message-ID: Date: Thu, 28 Oct 2021 23:37:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20211027234320.16fc848b@nbbrfq> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:FQbagfH/qSD2ZfAHJWcG5e4EX/ZG8pOiy8KuHVUqMFj5NXsFQJq A9cYuPOiSo9muVZYGTNQWctZ4rZpmA5TZexCwgBTi7l+OteFw/xsATb4U+jWrDyXaeZe1B1 BcFuwh+wg5MVIaRnM+4qzW+BiJLF/Ai7PFiQbUYDuJjM1phuV5LmIAe8dz49At0b+ksG8K8 1w77S3pVbQpTcdHIUxTtA== X-UI-Out-Filterresults: notjunk:1;V03:K0:RL2mujCTsU8=:36cnmceqzX+1cKaEZFI+v/ 4eO/sclYM0z/Wnz/PCFHaJ1pQ14Qu2SHAg1+d1okuDHEXM4TtHFTHX58a7M481YtMwAcRwTeO KPWeHc/hfO3A5S15X5+9T06AwK3ZL1rahoQNaiHSSwKvzAWb3IDeFQpLM5t4SDrtKonq/XxuR Wyzy/PEnhicGMLFbY9vjFX/rDg186cQ91pBC/LNv89M0Fb3e/IHjGU7QEXYMWNW5LNECZbh1B 32vOqnuOFad/El0tq+Hfp4YTpVHkhrVgKO3/CVLDEzC9PSdSw4bdquYTHC6kFTCOz+RmfM07D 4F4llR+xA4oS4xG5MKJIHDaJawipvXOYAN9m+9VQprs0k7kM2L6/XIbd+oznlY3A97s0vz21p Eav7wj1ohNqoN7p3wgwkOyR1ai3Ihx4it2DyH+w1HoftcETFkqvArOOs+XrSV6UahWdmiUg4F ggCMsPPZf9lMSyTXq612zWwzE5p0CcaJ5hrMeMxmq/pvLcKI3rhQb6uaSAfF/x+k9u1XHdHA9 sytFDEDkMcjEAON/ZlBvwBececcNwY0ijtuj9Ncfiz+Q6sO10xdy79ojmYNtyEoTs1D+yaKn4 JJyeskYmKaWFZny337Kim7py3r9ZmnTecWCgm4Z74KMhYR5ciSaZAtqNrGQWeKG/dfJ6VcV8y k0btJi2NEbtlhAJZJF+OMBV+NPE8sax7VX/Ka5V6Wvq8zcONFBATXntsdiiqbVyzodrHr3Ml1 QpM8RSEmYr700MmEE3Cc7IUNeAL98ZngrEJ4aVkjkAAEFhuLE5wPjbCcY7QLGy0XvSKAOfE2P BgGbwQn7rJTSRDldv0a0B6nnnOqVpAwDE3aSPTkS5lbT/2F/xZZIX/g1ejGpGFgCOrJ1fpsHe L6iU4Qu7e97lJ1UZsMicEMoDLors3RSDL+yRUF0hUnSurg/LUzYte0rVvxahT7UAFSvaZpGxi zCA98dLxOA7bjHbClTLySzRPp3QTJ+wN8XFQeUHqOBWFO7fg7FYQCyVqFdmG7ltwdCC3SK7cr N2HoS8FMosEwzHOHpeNp8eiSchjlznlU9v5e3cl1623Hw67h2aFazfzbpjvBjYKBfA== X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_STOCKGEN, NICE_REPLY_A, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: fortran@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Fortran mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2021 21:38:14 -0000 Hi Bernhard, Am 27.10.21 um 23:43 schrieb Bernhard Reutner-Fischer via Gcc-patches: > ping > [I'll rebase and retest this too since it's been a while. > Ok if it passes?] > > On Sun, 21 Oct 2018 16:04:34 +0200 > Bernhard Reutner-Fischer wrote: > >> Hi! >> >> Regtested on x86_64-unknown-linux, installing on >> aldot/fortran-fe-stringpool. >> >> We did not free global symbols. For a simplified abstract_type_3.f03 >> valgrind reports: >> >> 96 bytes in 1 blocks are still reachable in loss record 461 of 602 >> at 0x48377D5: calloc (vg_replace_malloc.c:711) >> by 0x21257C3: xcalloc (xmalloc.c:162) >> by 0x98611B: gfc_get_gsymbol(char const*) (symbol.c:4341) >> by 0x932C58: parse_module() (parse.c:5912) >> by 0x9336F8: gfc_parse_file() (parse.c:6236) >> by 0x991449: gfc_be_parse_file() (f95-lang.c:204) >> by 0x11D8EDE: compile_file() (toplev.c:455) >> by 0x11DB9C3: do_compile() (toplev.c:2170) >> by 0x11DBCAF: toplev::main(int, char**) (toplev.c:2305) >> by 0x2045D37: main (main.c:39) >> >> This patch reduces leaks to >> >> LEAK SUMMARY: >> definitely lost: 344 bytes in 1 blocks >> indirectly lost: 3,024 bytes in 4 blocks >> possibly lost: 0 bytes in 0 blocks >> - still reachable: 1,576,174 bytes in 2,277 blocks >> + still reachable: 1,576,078 bytes in 2,276 blocks >> suppressed: 0 bytes in 0 blocks >> >> gcc/fortran/ChangeLog: >> >> 2018-10-21 Bernhard Reutner-Fischer >> >> * parse.c (clean_up_modules): Free gsym. >> --- >> gcc/fortran/parse.c | 18 +++++++++++------- >> 1 file changed, 11 insertions(+), 7 deletions(-) >> >> diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c >> index b7265c42f58..f7c369a17ac 100644 >> --- a/gcc/fortran/parse.c >> +++ b/gcc/fortran/parse.c >> @@ -6066,7 +6066,7 @@ resolve_all_program_units (gfc_namespace *gfc_glo= bal_ns_list) >> >> >> static void >> -clean_up_modules (gfc_gsymbol *gsym) >> +clean_up_modules (gfc_gsymbol *&gsym) >> { >> if (gsym =3D=3D NULL) >> return; >> @@ -6074,14 +6074,18 @@ clean_up_modules (gfc_gsymbol *gsym) >> clean_up_modules (gsym->left); >> clean_up_modules (gsym->right); >> >> - if (gsym->type !=3D GSYM_MODULE || !gsym->ns) >> + if (gsym->type !=3D GSYM_MODULE) >> return; >> >> - gfc_current_ns =3D gsym->ns; >> - gfc_derived_types =3D gfc_current_ns->derived_types; >> - gfc_done_2 (); >> - gsym->ns =3D NULL; >> - return; >> + if (gsym->ns) >> + { >> + gfc_current_ns =3D gsym->ns; >> + gfc_derived_types =3D gfc_current_ns->derived_types; >> + gfc_done_2 (); >> + gsym->ns =3D NULL; >> + } >> + free (gsym); >> + gsym =3D NULL; this essentially looks fine, but did you inspect the callers? With the change to the interface (*gsym -> *&gsym), it could have effects not visible here due to the explicit gsym =3D NULL. Assuming you checked that, and if it regtests fine, then it is OK for mainline. Thanks for the patch! Harald >> } >> >> > >