public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Mikael Morin <mikael@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9244] fortran: Reuse associated_dummy memory if previously allocated [PR108923] Date: Sun, 12 Mar 2023 10:48:34 +0000 (GMT) [thread overview] Message-ID: <20230312104834.EBCA33858C31@sourceware.org> (raw) https://gcc.gnu.org/g:7b0c9631ccb492c4457a91dbb91e7a5bcd0bc2a6 commit r12-9244-g7b0c9631ccb492c4457a91dbb91e7a5bcd0bc2a6 Author: Mikael Morin <mikael@gcc.gnu.org> 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;
reply other threads:[~2023-03-12 10:48 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230312104834.EBCA33858C31@sourceware.org \ --to=mikael@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).