From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Mon, 19 Dec 2016 18:46:04 +0000 (-0800)
Subject: nir: Correctly handle blocks in cf_node_cf_tree_next
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=993e9195d42763d43f9f7453f77ac5b667f799e3;p=mesa.git

nir: Correctly handle blocks in cf_node_cf_tree_next

Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
---

diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index 2c3531cc2dd..885616e99c3 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -1753,7 +1753,7 @@ nir_block *nir_cf_node_cf_tree_last(nir_cf_node *node)
 nir_block *nir_cf_node_cf_tree_next(nir_cf_node *node)
 {
    if (node->type == nir_cf_node_block)
-      return nir_cf_node_cf_tree_first(nir_cf_node_next(node));
+      return nir_block_cf_tree_next(nir_cf_node_as_block(node));
    else if (node->type == nir_cf_node_function)
       return NULL;
    else