commit c95d785028b7f890e69cde69acd931f95666dcac
author Jason Ekstrand <jason@jlekstrand.net> Wed Feb 12 15:28:46 2020 -0600
committer Craig Stout <cstout@google.com> Wed Jul 08 14:18:02 2020 +0000
tree 28009dbd7e7c7e5a9feb1aa1bf0df93f8093bfed
parent ded1dd6bc7ea4cc995542b6a59051348622b1f81

spirv: Make vtn_function a vtn_cf_node

Cherry-pick'd from d94e464a9fc5da334ae224810f855fff6890be50

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3820>
Change-Id: I2a6c4e1bb2fb14da14fd96de9f2f9f31cc4b6c0b
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/403195
Reviewed-by: John Bauman <jbauman@google.com>

src/compiler/spirv/spirv_to_nir.c

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 1da42d0..31323e3 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -5170,7 +5170,7 @@
    b->file = NULL;
    b->line = -1;
    b->col = -1;
-   exec_list_make_empty(&b->functions);
+   list_inithead(&b->functions);
    b->entry_point_stage = stage;
    b->entry_point_name = entry_point_name;
    b->options = dup_options;
@@ -5368,7 +5368,8 @@
    bool progress;
    do {
       progress = false;
-      foreach_list_typed(struct vtn_function, func, node, &b->functions) {
+      vtn_foreach_cf_node(node, &b->functions) {
+         struct vtn_function *func = vtn_cf_node_as_function(node);
          if (func->referenced && !func->emitted) {
             b->const_table = _mesa_pointer_hash_table_create(b);
 

src/compiler/spirv/vtn_cfg.c

diff --git a/src/compiler/spirv/vtn_cfg.c b/src/compiler/spirv/vtn_cfg.c
index f3c9010..8071129 100644
--- a/src/compiler/spirv/vtn_cfg.c
+++ b/src/compiler/spirv/vtn_cfg.c
@@ -251,6 +251,7 @@
       vtn_assert(b->func == NULL);
       b->func = rzalloc(b, struct vtn_function);
 
+      b->func->node.type = vtn_cf_node_type_function;
       list_inithead(&b->func->body);
       b->func->control = w[3];
 
@@ -368,7 +369,7 @@
           * implemented functions that we'll walk later.
           */
          b->func->start_block = b->block;
-         exec_list_push_tail(&b->functions, &b->func->node);
+         list_addtail(&b->func->node.link, &b->functions);
       }
       break;
    }
@@ -760,7 +761,8 @@
    vtn_foreach_instruction(b, words, end,
                            vtn_cfg_handle_prepass_instruction);
 
-   foreach_list_typed(struct vtn_function, func, node, &b->functions) {
+   vtn_foreach_cf_node(node, &b->functions) {
+      struct vtn_function *func = vtn_cf_node_as_function(node);
       vtn_cfg_walk_blocks(b, &func->body, func->start_block,
                           NULL, NULL, NULL, NULL, NULL);
    }

src/compiler/spirv/vtn_private.h

diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h
index 1c84a2c..d709c39 100644
--- a/src/compiler/spirv/vtn_private.h
+++ b/src/compiler/spirv/vtn_private.h
@@ -137,6 +137,7 @@
    vtn_cf_node_type_loop,
    vtn_cf_node_type_case,
    vtn_cf_node_type_switch,
+   vtn_cf_node_type_function,
 };
 
 struct vtn_cf_node {
@@ -226,7 +227,7 @@
 };
 
 struct vtn_function {
-   struct exec_node node;
+   struct vtn_cf_node node;
 
    struct vtn_type *type;
 
@@ -256,6 +257,7 @@
 VTN_DECL_CF_NODE_CAST(if)
 VTN_DECL_CF_NODE_CAST(case)
 VTN_DECL_CF_NODE_CAST(switch)
+VTN_DECL_CF_NODE_CAST(function)
 
 #define vtn_foreach_cf_node(node, cf_list) \
    list_for_each_entry(struct vtn_cf_node, node, cf_list, link)
@@ -654,7 +656,7 @@
    bool variable_pointers;
 
    struct vtn_function *func;
-   struct exec_list functions;
+   struct list_head functions;
 
    /* Current function parameter index */
    unsigned func_param_idx;