From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 5 Nov 2014 21:58:42 +0000 (-0800)
Subject: nir: Validate all lists in the validator
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73522ec83f845c6ab13f7da255bbe8c1e019cc20;p=mesa.git

nir: Validate all lists in the validator

Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
---

diff --git a/src/glsl/nir/nir_validate.c b/src/glsl/nir/nir_validate.c
index 1d8452d6920..332f4f0e6cb 100644
--- a/src/glsl/nir/nir_validate.c
+++ b/src/glsl/nir/nir_validate.c
@@ -391,6 +391,7 @@ validate_phi_instr(nir_phi_instr *instr, validate_state *state)
 
    validate_dest(&instr->dest, state);
 
+   exec_list_validate(&instr->srcs);
    assert(exec_list_length(&instr->srcs) ==
           state->block->predecessors->entries);
 }
@@ -445,6 +446,7 @@ validate_phi_src(nir_phi_instr *instr, nir_block *pred, validate_state *state)
 {
    state->instr = &instr->instr;
 
+   exec_list_validate(&instr->srcs);
    foreach_list_typed(nir_phi_src, src, node, &instr->srcs) {
       if (src->pred == pred) {
          validate_src(&src->src, state);
@@ -475,6 +477,7 @@ validate_block(nir_block *block, validate_state *state)
 
    state->block = block;
 
+   exec_list_validate(&block->instr_list);
    nir_foreach_instr(block, instr) {
       if (instr->type == nir_instr_type_phi) {
          assert(instr == nir_block_first_instr(block) ||
@@ -541,10 +544,12 @@ validate_if(nir_if *if_stmt, validate_state *state)
    nir_cf_node *old_parent = state->parent_node;
    state->parent_node = &if_stmt->cf_node;
 
+   exec_list_validate(&if_stmt->then_list);
    foreach_list_typed(nir_cf_node, cf_node, node, &if_stmt->then_list) {
       validate_cf_node(cf_node, state);
    }
 
+   exec_list_validate(&if_stmt->else_list);
    foreach_list_typed(nir_cf_node, cf_node, node, &if_stmt->else_list) {
       validate_cf_node(cf_node, state);
    }
@@ -572,6 +577,7 @@ validate_loop(nir_loop *loop, validate_state *state)
    nir_cf_node *old_parent = state->parent_node;
    state->parent_node = &loop->cf_node;
 
+   exec_list_validate(&loop->body);
    foreach_list_typed(nir_cf_node, cf_node, node, &loop->body) {
       validate_cf_node(cf_node, state);
    }
@@ -694,14 +700,17 @@ validate_function_impl(nir_function_impl *impl, validate_state *state)
    state->impl = impl;
    state->parent_node = &impl->cf_node;
 
+   exec_list_validate(&impl->locals);
    foreach_list_typed(nir_variable, var, node, &impl->locals) {
       validate_var_decl(var, false, state);
    }
 
+   exec_list_validate(&impl->registers);
    foreach_list_typed(nir_register, reg, node, &impl->registers) {
       prevalidate_reg_decl(reg, false, state);
    }
 
+   exec_list_validate(&impl->body);
    foreach_list_typed(nir_cf_node, node, node, &impl->body) {
       validate_cf_node(node, state);
    }
@@ -722,6 +731,7 @@ validate_function_overload(nir_function_overload *overload,
 static void
 validate_function(nir_function *func, validate_state *state)
 {
+   exec_list_validate(&func->overload_list);
    foreach_list_typed(nir_function_overload, overload, node, &func->overload_list) {
       assert(overload->function == func);
       validate_function_overload(overload, state);
@@ -766,18 +776,22 @@ nir_validate_shader(nir_shader *shader)
       validate_var_decl((nir_variable *) entry->data, true, &state);
    }
 
+   exec_list_validate(&shader->globals);
    foreach_list_typed(nir_variable, var, node, &shader->globals) {
      validate_var_decl(var, true, &state);
    }
 
+   exec_list_validate(&shader->system_values);
    foreach_list_typed(nir_variable, var, node, &shader->system_values) {
      validate_var_decl(var, true, &state);
    }
 
+   exec_list_validate(&shader->registers);
    foreach_list_typed(nir_register, reg, node, &shader->registers) {
       prevalidate_reg_decl(reg, true, &state);
    }
 
+   exec_list_validate(&shader->functions);
    foreach_list_typed(nir_function, func, node, &shader->functions) {
       validate_function(func, &state);
    }