nir/vars_to_ssa: Remove an unnecessary deref_arry_type check
authorCaio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Wed, 11 Apr 2018 06:13:39 +0000 (23:13 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Wed, 11 Apr 2018 18:05:05 +0000 (11:05 -0700)
Only fully-qualified direct derefs, collected in direct_deref_nodes,
are checked for aliasing, so it is already known up front that they
have only array derefs of type direct.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
src/compiler/nir/nir_lower_vars_to_ssa.c

index f327a14d9b378e6d14591eaad45dccbd86989951..970eb05307a46cf6dc1a8205b97ee1cdff97d96a 100644 (file)
@@ -298,15 +298,16 @@ deref_may_be_aliased_node(struct deref_node *node, nir_deref *deref,
       switch (deref->child->deref_type) {
       case nir_deref_type_array: {
          nir_deref_array *arr = nir_deref_as_array(deref->child);
-         if (arr->deref_array_type == nir_deref_array_type_indirect)
-            return true;
+
+         /* This is a child of one of the derefs in direct_deref_nodes,
+          * so we know it is direct.
+          */
+         assert(arr->deref_array_type == nir_deref_array_type_direct);
 
          /* If there is an indirect at this level, we're aliased. */
          if (node->indirect)
             return true;
 
-         assert(arr->deref_array_type == nir_deref_array_type_direct);
-
          if (node->children[arr->base_offset] &&
              deref_may_be_aliased_node(node->children[arr->base_offset],
                                        deref->child, state))