From 1ba40d834b652e1d8bedbf2ea34f0c023c5cc27d Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Tue, 12 Apr 2016 14:55:19 -0400 Subject: [PATCH] nir/opt_cp: fixup for new foreach_block() Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir_opt_copy_propagate.c | 28 ++++++++--------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/compiler/nir/nir_opt_copy_propagate.c b/src/compiler/nir/nir_opt_copy_propagate.c index 6847e71b35e..99aebae6867 100644 --- a/src/compiler/nir/nir_opt_copy_propagate.c +++ b/src/compiler/nir/nir_opt_copy_propagate.c @@ -240,29 +240,21 @@ copy_prop_if(nir_if *if_stmt) return copy_prop_src(&if_stmt->condition, NULL, if_stmt); } -static bool -copy_prop_block(nir_block *block, void *_state) -{ - bool *progress = (bool *) _state; - - nir_foreach_instr(block, instr) { - if (copy_prop_instr(instr)) - *progress = true; - } - - nir_if *if_stmt = nir_block_get_following_if(block); - if (if_stmt && copy_prop_if(if_stmt)) - *progress = true; - - return true; -} - static bool nir_copy_prop_impl(nir_function_impl *impl) { bool progress = false; - nir_foreach_block_call(impl, copy_prop_block, &progress); + nir_foreach_block(block, impl) { + nir_foreach_instr(block, instr) { + if (copy_prop_instr(instr)) + progress = true; + } + + nir_if *if_stmt = nir_block_get_following_if(block); + if (if_stmt && copy_prop_if(if_stmt)) + progress = true; + } if (progress) { nir_metadata_preserve(impl, nir_metadata_block_index | -- 2.30.2