From: Connor Abbott <cwabbott0@gmail.com>
Date: Tue, 12 Apr 2016 19:17:46 +0000 (-0400)
Subject: nir/validate: fixup for new foreach_block()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1f8c1006140cf755f35f4196bd703c4a586d7609;p=mesa.git

nir/validate: fixup for new foreach_block()

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

diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c
index 0555a0007cf..c7cef6a8095 100644
--- a/src/compiler/nir/nir_validate.c
+++ b/src/compiler/nir/nir_validate.c
@@ -957,15 +957,6 @@ postvalidate_ssa_def(nir_ssa_def *def, void *void_state)
    return true;
 }
 
-static bool
-postvalidate_ssa_defs_block(nir_block *block, void *state)
-{
-   nir_foreach_instr(block, instr)
-      nir_foreach_ssa_def(instr, postvalidate_ssa_def, state);
-
-   return true;
-}
-
 static void
 validate_function_impl(nir_function_impl *impl, validate_state *state)
 {
@@ -1025,7 +1016,10 @@ validate_function_impl(nir_function_impl *impl, validate_state *state)
       postvalidate_reg_decl(reg, state);
    }
 
-   nir_foreach_block_call(impl, postvalidate_ssa_defs_block, state);
+   nir_foreach_block(block, impl) {
+      nir_foreach_instr(block, instr)
+         nir_foreach_ssa_def(instr, postvalidate_ssa_def, state);
+   }
 }
 
 static void