fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965/cfg: Assert that cur_do/while/if pointers are non-NULL.

Browse source 
Coverity sees that the functions immediately below the new assertions
dereference these pointers, but is unaware that an ENDIF always follows
an IF, etc.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Matt Turner 2015-06-22 11:09:49 -07:00
parent 04758d25b4
commit 4d93a07c45
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_cfg.cpp
View file

@ -231,6 +231,7 @@ cfg_t::cfg_t(exec_list *instructions)
if (cur_else) { if (cur_else) {
cur_else->add_successor(mem_ctx, cur_endif); cur_else->add_successor(mem_ctx, cur_endif);
} else { } else {
assert(cur_if != NULL);
cur_if->add_successor(mem_ctx, cur_endif); cur_if->add_successor(mem_ctx, cur_endif);
} }
@ -299,6 +300,7 @@ cfg_t::cfg_t(exec_list *instructions)
inst->exec_node::remove(); inst->exec_node::remove();
cur->instructions.push_tail(inst); cur->instructions.push_tail(inst);
assert(cur_do != NULL && cur_while != NULL);
cur->add_successor(mem_ctx, cur_do); cur->add_successor(mem_ctx, cur_do);
set_next_block(&cur, cur_while, ip); set_next_block(&cur, cur_while, ip);