From 8948048c6f01209bac0051e41cd84c38853bd251 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 22 May 2019 22:13:15 -0500 Subject: [PATCH] nir/dead_cf: Call instructions aren't dead When we inlined cf_node_has_side_effects into node_is_dead, all the conditions flipped and we forgot to flip one. Fortunately, it doesn't matter right now because no one uses this pass on shaders with more than one function. Fixes: b50465d197 "nir/dead_cf: Inline cf_node_has_side_effects" Reviewed-by: Dave Airlie Reviewed-by: Caio Marcelo de Oliveira Filho --- src/compiler/nir/nir_opt_dead_cf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/nir/nir_opt_dead_cf.c b/src/compiler/nir/nir_opt_dead_cf.c index b0e9723d36c..33f3565c564 100644 --- a/src/compiler/nir/nir_opt_dead_cf.c +++ b/src/compiler/nir/nir_opt_dead_cf.c @@ -216,7 +216,7 @@ node_is_dead(nir_cf_node *node) nir_foreach_instr(instr, block) { if (instr->type == nir_instr_type_call) - return true; + return false; /* Return instructions can cause us to skip over other side-effecting * instructions after the loop, so consider them to have side effects -- 2.30.2