From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Thu, 6 Oct 2016 22:46:22 +0000 (-0700)
Subject: nir: Fix the control flow tests for nir_loop_first_block changes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=325b3fd668369e2ed0af937843e80e750d0b91ed;p=mesa.git

nir: Fix the control flow tests for nir_loop_first_block changes

Commit 2ed17d46de045404042f13c6591895a1cf31b167 changed
nir_loop_first_cf_node and friends to return a nir_block instead of a
nir_cf_node.  This broke one of the NIR control flow tests.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98128
---

diff --git a/src/compiler/nir/tests/control_flow_tests.cpp b/src/compiler/nir/tests/control_flow_tests.cpp
index db660fd074a..ae0954f90c6 100644
--- a/src/compiler/nir/tests/control_flow_tests.cpp
+++ b/src/compiler/nir/tests/control_flow_tests.cpp
@@ -76,7 +76,7 @@ TEST_F(nir_cf_test, delete_break_in_loop)
     * }
     */
    nir_block *block_0 = nir_start_block(b.impl);
-   nir_block *block_1 = nir_cf_node_as_block(nir_loop_first_cf_node(loop));
+   nir_block *block_1 = nir_loop_first_block(loop);
    nir_block *block_2 = nir_cf_node_as_block(nir_cf_node_next(&loop->cf_node));
    nir_block *block_3 = b.impl->end_block;
    ASSERT_EQ(nir_cf_node_block, block_0->cf_node.type);