From e5f37701ab6300c64e02d1c527ccc30fbda32fd3 Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Tue, 12 Apr 2016 14:57:35 -0400 Subject: [PATCH] nir/phi_builder: fixup for new foreach_block() Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir_phi_builder.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/compiler/nir/nir_phi_builder.c b/src/compiler/nir/nir_phi_builder.c index 1dd9c621cba..dd489755d62 100644 --- a/src/compiler/nir/nir_phi_builder.c +++ b/src/compiler/nir/nir_phi_builder.c @@ -78,14 +78,6 @@ struct nir_phi_builder_value { nir_ssa_def *defs[0]; }; -static bool -fill_block_array(nir_block *block, void *void_data) -{ - nir_block **blocks = void_data; - blocks[block->index] = block; - return true; -} - struct nir_phi_builder * nir_phi_builder_create(nir_function_impl *impl) { @@ -99,7 +91,9 @@ nir_phi_builder_create(nir_function_impl *impl) pb->num_blocks = impl->num_blocks; pb->blocks = ralloc_array(pb, nir_block *, pb->num_blocks); - nir_foreach_block_call(impl, fill_block_array, pb->blocks); + nir_foreach_block(block, impl) { + pb->blocks[block->index] = block; + } exec_list_make_empty(&pb->values); -- 2.30.2