public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Paul Pluzhnikov <ppluzhnikov@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] Minor: don't call _dl_debug_update (which can have side effects) inside assert Date: Sun, 26 Mar 2023 16:01:33 +0000 (GMT) [thread overview] Message-ID: <20230326160133.9EAC33858CDA@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1b5e65ef6a442fdccf88d43c3048f98292d85631 commit 1b5e65ef6a442fdccf88d43c3048f98292d85631 Author: Paul Pluzhnikov <ppluzhnikov@google.com> Date: Sat Mar 25 21:27:01 2023 +0000 Minor: don't call _dl_debug_update (which can have side effects) inside assert Diff: --- 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));
reply other threads:[~2023-03-26 16:01 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=20230326160133.9EAC33858CDA@sourceware.org \ --to=ppluzhnikov@sourceware.org \ --cc=glibc-cvs@sourceware.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).