spirv: Skip phis in unreachable blocks in the second phi pass
Closes: #3253
Fixes: 22fdb2f8551 "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>
diff --git a/src/compiler/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c
index 395a577..a31047b 100644
--- a/src/compiler/spirv/vtn_cfg.c
+++ b/src/compiler/spirv/vtn_cfg.c
@@ -1003,7 +1003,14 @@
return true;
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;
for (unsigned i = 3; i < count; i += 2) {
