<div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><br><div class="gmail_quote"><div dir="ltr">On Tue, Nov 20, 2018 at 6:40 PM Ian Romanick <<a href="mailto:idr@freedesktop.org">idr@freedesktop.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com" target="_blank">ian.d.romanick@intel.com</a>><br>
<br>
Signed-off-by: Ian Romanick <<a href="mailto:ian.d.romanick@intel.com" target="_blank">ian.d.romanick@intel.com</a>><br>
---<br>
 src/compiler/nir/nir_phi_builder.c | 4 ++--<br>
 1 file changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/src/compiler/nir/nir_phi_builder.c b/src/compiler/nir/nir_phi_builder.c<br>
index cc5ce81d120..add3efd2dfc 100644<br>
--- a/src/compiler/nir/nir_phi_builder.c<br>
+++ b/src/compiler/nir/nir_phi_builder.c<br>
@@ -147,7 +147,7 @@ nir_phi_builder_add_value(struct nir_phi_builder *pb, unsigned num_components,<br>
              * value to the magic value NEEDS_PHI.  Later, we create phi nodes<br>
              * on demand in nir_phi_builder_value_get_block_def().<br>
              */<br>
-            val->defs[next->index] = NEEDS_PHI;<br>
+            nir_phi_builder_value_set_block_def(val, next, NEEDS_PHI);<br>
<br>
             if (pb->work[next->index] < pb->iter_count) {<br>
                pb->work[next->index] = pb->iter_count;<br>
@@ -232,7 +232,7 @@ nir_phi_builder_value_get_block_def(struct nir_phi_builder_value *val,<br>
     *  2) To avoid unneeded recreation of phi nodes and undefs.<br>
     */<br>
    for (dom = block; dom && val->defs[dom->index] == NULL; dom = dom->imm_dom)<br>
-      val->defs[dom->index] = def;<br>
+      nir_phi_builder_value_set_block_def(val, dom, def);<br>
<br>
    return def;<br>
 }<br>
-- <br>
2.14.4<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>