From 1cbdafc47a46fa55fcd5afa9193525e694099944 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 10 May 2015 06:03:49 -0400 Subject: [PATCH] freedreno/ir3/nir: fix build break after f752effa Our lower if/else pass was missed when converting NIR to use linked lists rather than hashsets to track use/def sets. Signed-off-by: Rob Clark --- src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c b/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c index ae36019ed5f..dc9e4626f27 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_nir_lower_if_else.c @@ -74,14 +74,13 @@ valid_dest(nir_block *block, nir_dest *dest) * (so this is run iteratively in a loop). Therefore if * we get this far, it should not have any if_uses: */ - assert(dest->ssa.if_uses->entries == 0); + assert(list_empty(&dest->ssa.if_uses)); /* The only uses of this definition must be phi's in the * successor or in the current block */ - struct set_entry *entry; - set_foreach(dest->ssa.uses, entry) { - const nir_instr *dest_instr = entry->key; + nir_foreach_use(&dest->ssa, use) { + nir_instr *dest_instr = use->parent_instr; if (dest_instr->block == block) continue; if ((dest_instr->type == nir_instr_type_phi) && -- 2.30.2