From: Florian Weimer <fw@deneb.enyo.de>
To: Paul Pluzhnikov via Libc-alpha <libc-alpha@sourceware.org>
Cc: Paul Pluzhnikov <ppluzhnikov@google.com>,
Andreas Schwab <schwab@suse.de>
Subject: Re: [PATCH] Minor: don't call _dl_debug_update (which can have side effects) inside assert
Date: Sun, 26 Mar 2023 12:35:06 +0200 [thread overview]
Message-ID: <875yanyf51.fsf@mid.deneb.enyo.de> (raw)
In-Reply-To: <20230326002358.1244787-1-ppluzhnikov@google.com> (Paul Pluzhnikov via Libc-alpha's message of "Sun, 26 Mar 2023 00:24:00 +0000")
* Paul Pluzhnikov via Libc-alpha:
> On Sat, Mar 25, 2023 at 3:09 PM Florian Weimer <fw@deneb.enyo.de> wrote:
>
>> This needs __attribute__ ((unused)) on r_state to support building
>> with -DNDEBUG (although I have not tested that).
>
> Thanks. Revised patch included.
>
> ---
> elf/dl-open.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/elf/dl-open.c b/elf/dl-open.c
> index 91a2d8a538..2d985e21d8 100644
> --- a/elf/dl-open.c
> +++ b/elf/dl-open.c
> @@ -578,7 +578,9 @@ dl_open_worker_begin (void *a)
> if ((mode & RTLD_GLOBAL) && new->l_global == 0)
> add_to_global_update (new);
>
> - assert (_dl_debug_update (args->nsid)->r_state == RT_CONSISTENT);
> + const int r_state __attribute__ ((unused))
> + = _dl_debug_update (args->nsid)->r_state;
> + assert (r_state == RT_CONSISTENT);
>
> return;
> }
> @@ -927,7 +929,9 @@ no more namespaces available for dlmopen()"));
> _dl_signal_exception (errcode, &exception, NULL);
> }
>
> - assert (_dl_debug_update (args.nsid)->r_state == RT_CONSISTENT);
> + const int r_state __attribute__ ((unused))
> + = _dl_debug_update (args.nsid)->r_state;
> + assert (r_state == RT_CONSISTENT);
>
> /* Release the lock. */
> __rtld_lock_unlock_recursive (GL(dl_load_lock));
This version looks okay to me, thanks.
prev parent reply other threads:[~2023-03-26 10:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 12:54 Side effect inside assert macro? Andreas Schwab
2023-03-25 19:48 ` Paul Pluzhnikov
2023-03-25 21:32 ` [PATCH] Minor: don't call _dl_debug_update (which can have side effects) inside assert Paul Pluzhnikov
2023-03-25 22:09 ` Florian Weimer
2023-03-26 0:24 ` Paul Pluzhnikov
2023-03-26 10:35 ` Florian Weimer [this message]
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=875yanyf51.fsf@mid.deneb.enyo.de \
--to=fw@deneb.enyo.de \
--cc=libc-alpha@sourceware.org \
--cc=ppluzhnikov@google.com \
--cc=schwab@suse.de \
/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).