From dc4e660dfad86aa8cdd08a5ec8b9890095de7c07 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 7 Nov 2014 18:25:08 -0800 Subject: [PATCH] nir/nir: Fix a bug in move_successors The unlink_blocks function moves successors around to make sure that, if there is a remaining successor, it is in the first successors slot and not the second. To fix this, we simply get both successors up front. Reviewed-by: Connor Abbott --- src/glsl/nir/nir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c index 56891dc3401..d0e09ebb34e 100644 --- a/src/glsl/nir/nir.c +++ b/src/glsl/nir/nir.c @@ -739,10 +739,11 @@ static void move_successors(nir_block *source, nir_block *dest) { nir_block *succ1 = source->successors[0]; + nir_block *succ2 = source->successors[1]; + if (succ1) unlink_blocks(source, succ1); - nir_block *succ2 = source->successors[1]; if (succ2) unlink_blocks(source, succ2); -- 2.30.2