From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 6 Feb 2015 20:49:08 +0000 (-0800)
Subject: nir/from_ssa: Use the nir_block_dominance function instead of our own
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0167c38cacc00eef77d7f83d3929cdbc99378d11;p=mesa.git

nir/from_ssa: Use the nir_block_dominance function instead of our own

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
---

diff --git a/src/glsl/nir/nir_from_ssa.c b/src/glsl/nir/nir_from_ssa.c
index 2e7add38d31..3625237dd3d 100644
--- a/src/glsl/nir/nir_from_ssa.c
+++ b/src/glsl/nir/nir_from_ssa.c
@@ -54,13 +54,8 @@ ssa_def_dominates(nir_ssa_def *a, nir_ssa_def *b)
    } else if (a->parent_instr->block == b->parent_instr->block) {
       return a->live_index <= b->live_index;
    } else {
-      nir_block *block = b->parent_instr->block;
-      while (block->imm_dom != NULL) {
-         if (block->imm_dom == a->parent_instr->block)
-            return true;
-         block = block->imm_dom;
-      }
-      return false;
+      return nir_block_dominates(a->parent_instr->block,
+                                 b->parent_instr->block);
    }
 }