From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1647) id EBCA33858C31; Sun, 12 Mar 2023 10:48:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EBCA33858C31 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678618114; bh=YywyGPoP76A4wi7rHIrH5mqhfBnFk14p8Y+b7/3ZxgE=; h=From:To:Subject:Date:From; b=bfUeWjdHz3x1nykg3IGDLO8hhmT89d6fckAatFYm4WROzcUkwo6+pICLYmdvBTT8X ga3qKQD24Nkgv9aOeXs3Sj7H3TQlpgjlSMKxpQ/5Pti6YS/L9TA/VKNf6gsgZKre1i eLZoR+uPpc7/HTK7PEIH42TSOE1LtcZ79pTTkbRM= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Mikael Morin To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9244] fortran: Reuse associated_dummy memory if previously allocated [PR108923] X-Act-Checkin: gcc X-Git-Author: Mikael Morin X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: cd65c727fd6d5a252964dbeb3a735daa0a521a89 X-Git-Newrev: 7b0c9631ccb492c4457a91dbb91e7a5bcd0bc2a6 Message-Id: <20230312104834.EBCA33858C31@sourceware.org> Date: Sun, 12 Mar 2023 10:48:34 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7b0c9631ccb492c4457a91dbb91e7a5bcd0bc2a6 commit r12-9244-g7b0c9631ccb492c4457a91dbb91e7a5bcd0bc2a6 Author: Mikael Morin Date: Sat Feb 25 21:37:46 2023 +0100 fortran: Reuse associated_dummy memory if previously allocated [PR108923] This avoids making the associted_dummy field point to a new memory chunk if it's already pointing somewhere, in which case doing so would leak the previously allocated chunk. PR fortran/108923 gcc/fortran/ChangeLog: * intrinsic.cc (get_intrinsic_dummy_arg, set_intrinsic_dummy_arg): Rename the former to the latter. Remove the return value, add a reference to the lhs as argument, and do the pointer assignment inside the function. Don't do it if the pointer is already non-NULL. (sort_actual): Update caller. (cherry picked from commit 5c638095e7e0fa4de4e4f7326384a86830b25732) Diff: --- gcc/fortran/intrinsic.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/fortran/intrinsic.cc b/gcc/fortran/intrinsic.cc index e89131f5a71..ff5d728bb06 100644 --- a/gcc/fortran/intrinsic.cc +++ b/gcc/fortran/intrinsic.cc @@ -4259,15 +4259,15 @@ remove_nullargs (gfc_actual_arglist **ap) } -static gfc_dummy_arg * -get_intrinsic_dummy_arg (gfc_intrinsic_arg *intrinsic) +static void +set_intrinsic_dummy_arg (gfc_dummy_arg *&dummy_arg, + gfc_intrinsic_arg *intrinsic) { - gfc_dummy_arg * const dummy_arg = gfc_get_dummy_arg (); + if (dummy_arg == NULL) + dummy_arg = gfc_get_dummy_arg (); dummy_arg->intrinsicness = GFC_INTRINSIC_DUMMY_ARG; dummy_arg->u.intrinsic = intrinsic; - - return dummy_arg; } @@ -4430,7 +4430,7 @@ do_sort: if (a == NULL) a = gfc_get_actual_arglist (); - a->associated_dummy = get_intrinsic_dummy_arg (f); + set_intrinsic_dummy_arg (a->associated_dummy, f); if (actual == NULL) *ap = a;