diff options
| author | Jason Ekstrand <jason@jlekstrand.net> | 2019-06-05 16:54:40 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2019-06-20 10:04:16 -0700 |
| commit | a6f1bdc5c79697f112647f3f62edc0cb302c294a (patch) | |
| tree | d4153608c6f35066225cc6311a9ab8d4ab1ede78 | |
| parent | 3b7363f499764c6c24458271c1b1a98c07919553 (diff) | |
| download | mesa-a6f1bdc5c79697f112647f3f62edc0cb302c294a.tar.gz | |
nir/propagate_invariant: Don't add NULL vars to the hash table
Fixes: 8410cf66d "nir/propagate_invariant: Skip unknown vars"
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit d96878a66a559f6690f01e82f06fcf92ae958d3c)
| -rw-r--r-- | src/compiler/nir/nir_propagate_invariant.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/compiler/nir/nir_propagate_invariant.c b/src/compiler/nir/nir_propagate_invariant.c index 103b2422b83..a0cfde67891 100644 --- a/src/compiler/nir/nir_propagate_invariant.c +++ b/src/compiler/nir/nir_propagate_invariant.c @@ -65,12 +65,21 @@ add_cf_node(nir_cf_node *cf, struct set *invariants) static void add_var(nir_variable *var, struct set *invariants) { - _mesa_set_add(invariants, var); + /* Because we pass the result of nir_intrinsic_get_var directly to this + * function, it's possible for var to be NULL if, for instance, there's a + * cast somewhere in the chain. + */ + if (var != NULL) + _mesa_set_add(invariants, var); } static bool var_is_invariant(nir_variable *var, struct set * invariants) { + /* Because we pass the result of nir_intrinsic_get_var directly to this + * function, it's possible for var to be NULL if, for instance, there's a + * cast somewhere in the chain. + */ return var && (var->data.invariant || _mesa_set_search(invariants, var)); } |