[Mesa-dev] [PATCH v4 2/4] util/ralloc: Don't define assert with magic member without DEBUG

[Eric Engestrom]

On Tuesday, 2017-09-26 23:38:11 +0000, Dylan Baker wrote:
> It is possible to have DEBUG disabled but asserts on (NDEBUG(, which

parentheses typo

other than that:
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>

and I think you should've pushed these first two patches instead of
carrying them in your unrelated meson series :)

speaking of, I'm happy to write the egl/meson.build; I'll get on that
when the initial support lands.

> cannot build because these asserts work on members that are only present
> when DEBUG is on.
> 
> Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  src/util/ralloc.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/src/util/ralloc.c b/src/util/ralloc.c
> index 566f08ad94e..9cce9e02f68 100644
> --- a/src/util/ralloc.c
> +++ b/src/util/ralloc.c
> @@ -630,7 +630,9 @@ linear_alloc_child(void *parent, unsigned size)
>     linear_size_chunk *ptr;
>     unsigned full_size;
>  
> +#ifdef DEBUG
>     assert(first->magic == LMAGIC);
> +#endif
>     assert(!latest->next);
>  
>     size = ALIGN_POT(size, SUBALLOC_ALIGNMENT);
> @@ -702,7 +704,9 @@ linear_free_parent(void *ptr)
>        return;
>  
>     node = LINEAR_PARENT_TO_HEADER(ptr);
> +#ifdef DEBUG
>     assert(node->magic == LMAGIC);
> +#endif
>  
>     while (node) {
>        void *ptr = node;
> @@ -721,7 +725,9 @@ ralloc_steal_linear_parent(void *new_ralloc_ctx, void *ptr)
>        return;
>  
>     node = LINEAR_PARENT_TO_HEADER(ptr);
> +#ifdef DEBUG
>     assert(node->magic == LMAGIC);
> +#endif
>  
>     while (node) {
>        ralloc_steal(new_ralloc_ctx, node);
> @@ -734,7 +740,9 @@ void *
>  ralloc_parent_of_linear_parent(void *ptr)
>  {
>     linear_header *node = LINEAR_PARENT_TO_HEADER(ptr);
> +#ifdef DEBUG
>     assert(node->magic == LMAGIC);
> +#endif
>     return node->ralloc_parent;
>  }
>  
> -- 
> 2.14.1
>