nir: Correctly handle blocks in cf_node_cf_tree_next
authorJason Ekstrand <jason.ekstrand@intel.com>
Mon, 19 Dec 2016 18:46:04 +0000 (10:46 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 23 Dec 2016 00:27:19 +0000 (16:27 -0800)
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
src/compiler/nir/nir.c

index 2c3531cc2dd2cecc651ef72d537f483d2de99fe9..885616e99c386a83e1b491845610ae27cd68bdb2 100644 (file)
@@ -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