public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Minor: don't call _dl_debug_update (which can have side effects) inside assert
@ 2023-03-26 16:01 Paul Pluzhnikov
0 siblings, 0 replies; only message in thread
From: Paul Pluzhnikov @ 2023-03-26 16:01 UTC (permalink / raw)
To: glibc-cvs
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));
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-03-26 16:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-26 16:01 [glibc] Minor: don't call _dl_debug_update (which can have side effects) inside assert Paul Pluzhnikov
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).