From: Connor Abbott <cwabbott0@gmail.com>
Date: Fri, 8 Apr 2016 21:43:48 +0000 (-0400)
Subject: nir/opt_dce: fixup for new foreach_block()
X-Git-Tag: upstream/17.1.0~10458
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddc6639f8596d0d44d84e0b0fd3a5461c953c4b2;p=platform%2Fupstream%2Fmesa.git

nir/opt_dce: fixup for new foreach_block()

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

diff --git a/src/compiler/nir/nir_opt_dce.c b/src/compiler/nir/nir_opt_dce.c
index ee656ac..d94f4be 100644
--- a/src/compiler/nir/nir_opt_dce.c
+++ b/src/compiler/nir/nir_opt_dce.c
@@ -113,10 +113,8 @@ init_instr(nir_instr *instr, struct exec_list *worklist)
 }
 
 static bool
-init_block_cb(nir_block *block, void *_state)
+init_block(nir_block *block, struct exec_list *worklist)
 {
-   struct exec_list *worklist = (struct exec_list *) _state;
-
    nir_foreach_instr(block, instr)
       init_instr(instr, worklist);
 
@@ -131,27 +129,14 @@ init_block_cb(nir_block *block, void *_state)
 }
 
 static bool
-delete_block_cb(nir_block *block, void *_state)
-{
-   bool *progress = (bool *) _state;
-
-   nir_foreach_instr_safe(block, instr) {
-      if (!instr->pass_flags) {
-         nir_instr_remove(instr);
-         *progress = true;
-      }
-   }
-
-   return true;
-}
-
-static bool
 nir_opt_dce_impl(nir_function_impl *impl)
 {
    struct exec_list *worklist = ralloc(NULL, struct exec_list);
    exec_list_make_empty(worklist);
 
-   nir_foreach_block_call(impl, init_block_cb, worklist);
+   nir_foreach_block(block, impl) {
+      init_block(block, worklist);
+   }
 
    while (!exec_list_is_empty(worklist)) {
       nir_instr *instr = worklist_pop(worklist);
@@ -161,7 +146,15 @@ nir_opt_dce_impl(nir_function_impl *impl)
    ralloc_free(worklist);
 
    bool progress = false;
-   nir_foreach_block_call(impl, delete_block_cb, &progress);
+
+   nir_foreach_block(block, impl) {
+      nir_foreach_instr_safe(block, instr) {
+         if (!instr->pass_flags) {
+            nir_instr_remove(instr);
+            progress = true;
+         }
+      }
+   }
 
    if (progress)
       nir_metadata_preserve(impl, nir_metadata_block_index |