Module: Mesa Branch: master Commit: c8b9cf429f9b2ce1cd17759eecbdbb0482ab271c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8b9cf429f9b2ce1cd17759eecbdbb0482ab271c
Author: Dylan Baker <[email protected]> Date: Wed Sep 20 10:52:40 2017 -0700 util/ralloc: Don't define assert with magic member without DEBUG It is possible to have DEBUG disabled but asserts on (NDEBUG), which cannot build because these asserts work on members that are only present when DEBUG is on. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Signed-off-by: Dylan Baker <[email protected]> --- src/util/ralloc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/ralloc.c b/src/util/ralloc.c index 566f08ad94..9cce9e02f6 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; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
