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

spirv: Skip phis in unreachable blocks in the second phi pass

Browse source 
Closes: #3253
Fixes: 22fdb2f855 "nir/spirv: Update to the latest revision"
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5855>
This commit is contained in:
Jason Ekstrand 2020-07-10 16:09:27 -05:00 • committed by Marge Bot
parent e086f64d39
commit 81773b4b44
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/compiler/spirv/vtn_cfg.c
View file

@ -1003,7 +1003,14 @@ vtn_handle_phi_second_pass(struct vtn_builder *b, SpvOp opcode,
return true; return true;
struct hash_entry *phi_entry = _mesa_hash_table_search(b->phi_table, w); struct hash_entry *phi_entry = _mesa_hash_table_search(b->phi_table, w);
vtn_assert(phi_entry);
/* It's possible that this phi is in an unreachable block in which case it
* may never have been emitted and therefore may not be in the hash table.
* In this case, there's no var for it and it's safe to just bail.
*/
if (phi_entry == NULL)
return true;
nir_variable *phi_var = phi_entry->data; nir_variable *phi_var = phi_entry->data;
for (unsigned i = 3; i < count; i += 2) { for (unsigned i = 3; i < count; i += 2) {