OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/validator: Validate that all used variables exist

Browse Source 
We were validating this for locals but nothing else.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2018-03-20 16:57:51 -07:00
parent 2b977989f3
commit 9978f55cd1
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/nir/nir_validate.c
View File

@@ -96,7 +96,9 @@ typedef struct {
/* bitset of registers we have currently found; used to check uniqueness */ /* bitset of registers we have currently found; used to check uniqueness */
BITSET_WORD *regs_found; BITSET_WORD *regs_found;
/* map of local variable -> function implementation where it is defined */ /* map of variable -> function implementation where it is defined or NULL
* if it is a global variable
*/
struct hash_table *var_defs; struct hash_table *var_defs;
/* map of instruction/var/etc to failed assert string */ /* map of instruction/var/etc to failed assert string */
@@ -450,12 +452,10 @@ validate_deref_chain(nir_deref *deref, nir_variable_mode mode,
static void static void
validate_var_use(nir_variable *var, validate_state *state) validate_var_use(nir_variable *var, validate_state *state)
{ {
if (var->data.mode == nir_var_local) { struct hash_entry *entry = _mesa_hash_table_search(state->var_defs, var);
struct hash_entry *entry = _mesa_hash_table_search(state->var_defs, var); validate_assert(state, entry);
if (var->data.mode == nir_var_local)
validate_assert(state, entry);
validate_assert(state, (nir_function_impl *) entry->data == state->impl); validate_assert(state, (nir_function_impl *) entry->data == state->impl);
}
} }
static void static void
@@ -1002,9 +1002,8 @@ validate_var_decl(nir_variable *var, bool is_global, validate_state *state)
* support) * support)
*/ */
if (!is_global) { _mesa_hash_table_insert(state->var_defs, var,
_mesa_hash_table_insert(state->var_defs, var, state->impl); is_global ? NULL : state->impl);
}
state->var = NULL; state->var = NULL;
} }