Commit 8889cc12 authored by Jason Ekstrand's avatar Jason Ekstrand Committed by Dylan Baker

nir: Handle complex derefs in nir_split_array_vars

We already bail and don't split the vars but we were passing a NULL to
_mesa_hash_table_search which is not allowed.

Fixes: f1cb3348 "nir/split_vars: Properly bail in the presence of ..."
Reviewed-by: Caio Marcelo de Oliveira Filho's avatarCaio Marcelo de Oliveira Filho <>
(cherry picked from commit 37cdb7fc)
parent 89776bb4
......@@ -427,8 +427,11 @@ get_array_deref_info(nir_deref_instr *deref,
if (!(deref->mode & modes))
return NULL;
return get_array_var_info(nir_deref_instr_get_variable(deref),
nir_variable *var = nir_deref_instr_get_variable(deref);
if (var == NULL)
return NULL;
return get_array_var_info(var, var_info_map);
static void
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment