From: Harald Anlauf <anlauf@gmx.de>
To: gcc-patches@gcc.gnu.org
Cc: fortran@gcc.gnu.org
Subject: Re: [PATCH 3/3] Fortran: Fix mpz and mpfr memory leaks
Date: Mon, 3 Apr 2023 21:50:49 +0200 [thread overview]
Message-ID: <57162b6a-95e0-35c6-386a-3687908fce05@gmx.de> (raw)
Message-ID: <20230403195049.yuJ40bErKboOKpmeL19kG3JDcLyXhwKZ92M8CRJk1EY@z> (raw)
In-Reply-To: <20230402150515.40826-4-rep.dot.nop@gmail.com>
Hi Bernhard,
there is neither context nor a related PR with a testcase showing
that this patch fixes issues seen there.
On 4/2/23 17:05, Bernhard Reutner-Fischer via Gcc-patches wrote:
> From: Bernhard Reutner-Fischer <aldot@gcc.gnu.org>
>
> Cc: fortran@gcc.gnu.org
>
> gcc/fortran/ChangeLog:
>
> * array.cc (gfc_ref_dimen_size): Free mpz memory before ICEing.
> * expr.cc (find_array_section): Fix mpz memory leak.
> * simplify.cc (gfc_simplify_reshape): Fix mpz memory leaks in
> error paths.
> (gfc_simplify_set_exponent): Fix mpfr memory leak.
> ---
> gcc/fortran/array.cc | 3 +++
> gcc/fortran/expr.cc | 8 ++++----
> gcc/fortran/simplify.cc | 7 ++++++-
> 3 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/gcc/fortran/array.cc b/gcc/fortran/array.cc
> index be5eb8b6a0f..8b1e816a859 100644
> --- a/gcc/fortran/array.cc
> +++ b/gcc/fortran/array.cc
> @@ -2541,6 +2541,9 @@ gfc_ref_dimen_size (gfc_array_ref *ar, int dimen, mpz_t *result, mpz_t *end)
> return t;
>
> default:
> + mpz_clear (lower);
> + mpz_clear (stride);
> + mpz_clear (upper);
> gfc_internal_error ("gfc_ref_dimen_size(): Bad dimen_type");
> }
What is the point of clearing variables before issuing a gfc_internal_error?
> diff --git a/gcc/fortran/expr.cc b/gcc/fortran/expr.cc
> index 7fb33f81788..b4736804eda 100644
> --- a/gcc/fortran/expr.cc
> +++ b/gcc/fortran/expr.cc
> @@ -1539,6 +1539,7 @@ find_array_section (gfc_expr *expr, gfc_ref *ref)
> mpz_init_set_ui (delta_mpz, one);
> mpz_init_set_ui (nelts, one);
> mpz_init (tmp_mpz);
> + mpz_init (ptr);
>
> /* Do the initialization now, so that we can cleanup without
> keeping track of where we were. */
> @@ -1682,7 +1683,6 @@ find_array_section (gfc_expr *expr, gfc_ref *ref)
> mpz_mul (delta_mpz, delta_mpz, tmp_mpz);
> }
>
> - mpz_init (ptr);
> cons = gfc_constructor_first (base);
>
> /* Now clock through the array reference, calculating the index in
> @@ -1735,7 +1735,8 @@ find_array_section (gfc_expr *expr, gfc_ref *ref)
> "at %L requires an increase of the allowed %d "
> "upper limit. See %<-fmax-array-constructor%> "
> "option", &expr->where, flag_max_array_constructor);
> - return false;
> + t = false;
> + goto cleanup;
> }
>
> cons = gfc_constructor_lookup (base, limit);
> @@ -1750,8 +1751,6 @@ find_array_section (gfc_expr *expr, gfc_ref *ref)
> gfc_copy_expr (cons->expr), NULL);
> }
>
> - mpz_clear (ptr);
> -
> cleanup:
>
> mpz_clear (delta_mpz);
> @@ -1765,6 +1764,7 @@ cleanup:
> mpz_clear (ctr[d]);
> mpz_clear (stride[d]);
> }
> + mpz_clear (ptr);
> gfc_constructor_free (base);
> return t;
> }
> diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc
> index ecf0e3558df..d1f06335e79 100644
> --- a/gcc/fortran/simplify.cc
> +++ b/gcc/fortran/simplify.cc
> @@ -6866,6 +6866,7 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
> gfc_error ("The SHAPE array for the RESHAPE intrinsic at %L has a "
> "negative value %d for dimension %d",
> &shape_exp->where, shape[rank], rank+1);
> + mpz_clear (index);
> return &gfc_bad_expr;
> }
>
> @@ -6889,6 +6890,7 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
> {
> gfc_error ("Shapes of ORDER at %L and SHAPE at %L are different",
> &order_exp->where, &shape_exp->where);
> + mpz_clear (index);
> return &gfc_bad_expr;
> }
>
> @@ -6902,6 +6904,7 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
> {
> gfc_error ("Sizes of ORDER at %L and SHAPE at %L are different",
> &order_exp->where, &shape_exp->where);
> + mpz_clear (index);
> return &gfc_bad_expr;
> }
>
> @@ -6918,6 +6921,7 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
> "in the range [1, ..., %d] for the RESHAPE intrinsic "
> "near %L", order[i], &order_exp->where, rank,
> &shape_exp->where);
> + mpz_clear (index);
> return &gfc_bad_expr;
> }
>
> @@ -6926,6 +6930,7 @@ gfc_simplify_reshape (gfc_expr *source, gfc_expr *shape_exp,
> {
> gfc_error ("ORDER at %L is not a permutation of the size of "
> "SHAPE at %L", &order_exp->where, &shape_exp->where);
> + mpz_clear (index);
> return &gfc_bad_expr;
> }
> x[order[i]] = 1;
> @@ -7408,7 +7413,7 @@ gfc_simplify_set_exponent (gfc_expr *x, gfc_expr *i)
> exp2 = (unsigned long) mpz_get_d (i->value.integer);
> mpfr_mul_2exp (result->value.real, frac, exp2, GFC_RND_MODE);
>
> - mpfr_clears (absv, log2, pow2, frac, NULL);
> + mpfr_clears (exp, absv, log2, pow2, frac, NULL);
>
> return range_check (result, "SET_EXPONENT");
> }
next prev parent reply other threads:[~2023-04-03 19:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-06 10:11 [PATCH] [RFC] RAII auto_mpfr and autp_mpz Richard Biener
2023-03-06 10:44 ` Jonathan Wakely
2023-03-06 11:01 ` Richard Biener
2023-03-06 11:03 ` Jonathan Wakely
2023-03-06 11:10 ` Jakub Jelinek
2023-03-06 11:29 ` Richard Biener
2023-03-07 18:51 ` Bernhard Reutner-Fischer
2023-03-07 19:03 ` Jakub Jelinek
2023-04-02 15:05 ` [PATCH 0/3] Fix mpfr and mpz memory leaks Bernhard Reutner-Fischer
2023-04-02 15:05 ` [PATCH 1/3] go: Fix memory leak in Integer_expression Bernhard Reutner-Fischer
2023-04-02 15:05 ` [PATCH 2/3] rust: Fix memory leak in compile_{integer,float}_literal Bernhard Reutner-Fischer
2023-04-02 15:05 ` [PATCH 3/3] Fortran: Fix mpz and mpfr memory leaks Bernhard Reutner-Fischer
2023-04-03 19:50 ` Harald Anlauf [this message]
2023-04-03 19:50 ` Harald Anlauf
2023-04-03 21:42 ` Bernhard Reutner-Fischer
2023-04-17 19:47 ` ping " Bernhard Reutner-Fischer
2023-04-17 22:18 ` Steve Kargl
2023-05-08 6:00 ` Bernhard Reutner-Fischer
2023-03-07 19:15 ` [PATCH] [RFC] RAII auto_mpfr and autp_mpz Alexander Monakov
2023-03-07 21:35 ` Jonathan Wakely
2023-03-07 21:51 ` Alexander Monakov
2023-03-07 21:54 ` Jonathan Wakely
2023-03-07 21:59 ` Marek Polacek
2023-03-08 7:25 ` Richard Biener
2023-03-08 10:13 ` Jonathan Wakely
2023-03-08 10:33 ` Jakub Jelinek
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=57162b6a-95e0-35c6-386a-3687908fce05@gmx.de \
--to=anlauf@gmx.de \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@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: link
Be 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).