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

nir/find_array_copies: Use correct parent array length 

instr->type is the type of the array element, not the type of the array
being dereferenced. Rather than fishing out the parent type, just use
parent->num_children which should be the length plus 1. While we're here
add another assert for the issue fixed by the previous commit.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111251
Fixes: 156306e5e6 ("nir/find_array_copies: Handle wildcards and overlapping copies")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Connor Abbott 2019-07-30 11:05:22 +02:00
parent 7788992bc6
commit a094928abc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/nir/nir_opt_find_array_copies.c
View File

@ -100,14 +100,15 @@ node_for_deref(nir_deref_instr *instr, struct match_node *parent,
}
case nir_deref_type_array_wildcard:
idx = glsl_get_length(instr->type);
idx = parent->num_children - 1;
break;
case nir_deref_type_array:
if (nir_src_is_const(instr->arr.index)) {
idx = nir_src_as_uint(instr->arr.index);
assert(idx < parent->num_children - 1);
} else {
idx = glsl_get_length(instr->type);
idx = parent->num_children - 1;
}
break;