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

[Florian Weimer <fw@deneb.enyo.de>]

* Paul Pluzhnikov via Libc-alpha:

> ---
>  elf/dl-open.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/elf/dl-open.c b/elf/dl-open.c
> index 91a2d8a538..d46956ea21 100644
> --- a/elf/dl-open.c
> +++ b/elf/dl-open.c
> @@ -578,7 +578,8 @@ 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 = _dl_debug_update (args->nsid)->r_state;
> +      assert (r_state == RT_CONSISTENT);
>  
>        return;
>      }
> @@ -927,7 +928,8 @@ 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 = _dl_debug_update (args.nsid)->r_state;
> +  assert (r_state == RT_CONSISTENT);
>  
>    /* Release the lock.  */
>    __rtld_lock_unlock_recursive (GL(dl_load_lock));

This needs __attribute__ ((unused)) on r_state to support building
with -DNDEBUG (although I have not tested that).