[PATCH] Minor: don't call _dl_debug_update (which can have side effects) inside assert

[Paul Pluzhnikov]

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));
-- 
2.40.0.348.gf938b09366-goog