Mesa (master): nir/opt_cp: use nir_block_get_following_if()

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: 958300137f26ee7d32d87a71e0c1843671d73732
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=958300137f26ee7d32d87a71e0c1843671d73732

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Tue Apr 12 14:52:43 2016 -0400

nir/opt_cp: use nir_block_get_following_if()

Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/compiler/nir/nir_opt_copy_propagate.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/compiler/nir/nir_opt_copy_propagate.c b/src/compiler/nir/nir_opt_copy_propagate.c
index acae60e..6847e71 100644
--- a/src/compiler/nir/nir_opt_copy_propagate.c
+++ b/src/compiler/nir/nir_opt_copy_propagate.c
@@ -250,13 +250,9 @@ copy_prop_block(nir_block *block, void *_state)
          *progress = true;
    }
 
-   if (block->cf_node.node.next != NULL && /* check that we aren't the end node */
-       !nir_cf_node_is_last(&block->cf_node) &&
-       nir_cf_node_next(&block->cf_node)->type == nir_cf_node_if) {
-      nir_if *if_stmt = nir_cf_node_as_if(nir_cf_node_next(&block->cf_node));
-      if (copy_prop_if(if_stmt))
-         *progress = true;
-   }
+   nir_if *if_stmt = nir_block_get_following_if(block);
+   if (if_stmt && copy_prop_if(if_stmt))
+      *progress = true;
 
    return true;
 }