diff options
| author | Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> | 2018-12-14 22:19:24 -0800 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2018-12-25 17:58:05 +0100 |
| commit | 4203d05c11000cabc6682b74eb5d2c172f62391f (patch) | |
| tree | 8e884463f0dc5116f7229542c4b1831930206358 | |
| parent | a1b25102c17b90323eee2740be11fd449e64d761 (diff) | |
nir: properly clear the entry sources in copy_prop_vars
When updating a copy entry source value from a "non-SSA" (the data
come from a copy instruction) to a "SSA" (the data or parts of it come
from SSA values), it was possible to hold invalid data in ssa[0]
depending on the writemask. Because the union, ssa[0] could contain a
pointer to a nir_deref_instr left-over from previous non-SSA usage.
Change code to clean up the array before use to avoid invalid data
around.
Fixes: 62332d139c8 "nir: Add a local variable-based copy propagation pass"
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
(cherry picked from commit 0ddc911f4d83a3c698ea02696e1b8706b2cce381)
| -rw-r--r-- | src/compiler/nir/nir_opt_copy_prop_vars.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/nir/nir_opt_copy_prop_vars.c b/src/compiler/nir/nir_opt_copy_prop_vars.c index d8c4cab34d7..d549b6315b1 100644 --- a/src/compiler/nir/nir_opt_copy_prop_vars.c +++ b/src/compiler/nir/nir_opt_copy_prop_vars.c @@ -352,6 +352,9 @@ store_to_entry(struct copy_prop_var_state *state, struct copy_entry *entry, { entry->comps_may_be_read &= ~write_mask; if (value->is_ssa) { + /* Clear src if it was being used as non-SSA. */ + if (!entry->src.is_ssa) + memset(entry->src.ssa, 0, sizeof(entry->src.ssa)); entry->src.is_ssa = true; /* Only overwrite the written components */ for (unsigned i = 0; i < 4; i++) { |