KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <kenneth@whitecape.org>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
This commit is contained in:
Dylan Baker 2017-09-20 10:52:40 -07:00
parent 848da66222
commit c8b9cf429f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/ralloc.c
View File

@ -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;
}