From: Vinson Lee <vlee@freedesktop.org>
Date: Sun, 8 Jan 2017 17:02:38 +0000 (-0800)
Subject: nir: Fix anonymous union initialization with older GCC.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=01d80bed1f639ed98f09107206ebe36899d3c852;p=mesa.git

nir: Fix anonymous union initialization with older GCC.

Fix this build error with GCC 4.4.7.

  CC     nir/nir_opt_copy_prop_vars.lo
nir/nir_opt_copy_prop_vars.c: In function ‘copy_prop_vars_block’:
nir/nir_opt_copy_prop_vars.c:765: error: unknown field ‘deref’ specified in initializer
nir/nir_opt_copy_prop_vars.c:765: warning: missing braces around initializer
nir/nir_opt_copy_prop_vars.c:765: warning: (near initialization for ‘(anonymous).<anonymous>’)
nir/nir_opt_copy_prop_vars.c:765: warning: initialization from incompatible pointer type

Fixes: 62332d139c8f ("nir: Add a local variable-based copy propagation pass")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c
index 8c24cd7f915..7f17469f641 100644
--- a/src/compiler/nir/nir_opt_copy_prop_vars.c
+++ b/src/compiler/nir/nir_opt_copy_prop_vars.c
@@ -762,7 +762,7 @@ copy_prop_vars_block(struct copy_prop_var_state *state,
          } else {
             value = (struct value) {
                .is_ssa = false,
-               .deref = src,
+               { .deref = src },
             };
          }