set *orig_kills = this->kills;
bool orig_killed_all = this->killed_all;
- acp = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
- _mesa_key_pointer_equal);
kills = _mesa_set_create(NULL, _mesa_hash_pointer,
_mesa_key_pointer_equal);
this->killed_all = false;
/* Populate the initial acp with a copy of the original */
- struct hash_entry *entry;
- hash_table_foreach(orig_acp, entry) {
- _mesa_hash_table_insert(acp, entry->key, entry->data);
- }
+ acp = _mesa_hash_table_clone(orig_acp, NULL);
visit_list_elements(this, instructions);
set *orig_kills = this->kills;
bool orig_killed_all = this->killed_all;
- acp = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
- _mesa_key_pointer_equal);
kills = _mesa_set_create(NULL, _mesa_hash_pointer,
_mesa_key_pointer_equal);
this->killed_all = false;
if (keep_acp) {
- struct hash_entry *entry;
- hash_table_foreach(orig_acp, entry) {
- _mesa_hash_table_insert(acp, entry->key, entry->data);
- }
+ acp = _mesa_hash_table_clone(orig_acp, NULL);
+ } else {
+ acp = _mesa_hash_table_create(NULL, _mesa_hash_pointer,
+ _mesa_key_pointer_equal);
}
visit_list_elements(this, &ir->body_instructions);
ralloc_free(mem_ctx);
}
+ void clone_acp(hash_table *lhs, hash_table *rhs)
+ {
+ lhs_ht = _mesa_hash_table_clone(lhs, mem_ctx);
+ rhs_ht = _mesa_hash_table_clone(rhs, mem_ctx);
+ }
+
void create_acp()
{
lhs_ht = _mesa_hash_table_create(mem_ctx, _mesa_hash_pointer,
_mesa_hash_table_destroy(rhs_ht, NULL);
}
- void populate_acp(hash_table *lhs, hash_table *rhs)
- {
- struct hash_entry *entry;
-
- hash_table_foreach(lhs, entry) {
- _mesa_hash_table_insert(lhs_ht, entry->key, entry->data);
- }
-
- hash_table_foreach(rhs, entry) {
- _mesa_hash_table_insert(rhs_ht, entry->key, entry->data);
- }
- }
-
void handle_loop(ir_loop *, bool keep_acp);
virtual ir_visitor_status visit_enter(class ir_loop *);
virtual ir_visitor_status visit_enter(class ir_function_signature *);
this->kills = new(mem_ctx) exec_list;
this->killed_all = false;
- create_acp();
-
/* Populate the initial acp with a copy of the original */
- populate_acp(orig_lhs_ht, orig_rhs_ht);
+ clone_acp(orig_lhs_ht, orig_rhs_ht);
visit_list_elements(this, instructions);
this->kills = new(mem_ctx) exec_list;
this->killed_all = false;
- create_acp();
-
if (keep_acp) {
/* Populate the initial acp with a copy of the original */
- populate_acp(orig_lhs_ht, orig_rhs_ht);
+ clone_acp(orig_lhs_ht, orig_rhs_ht);
+ } else {
+ create_acp();
}
visit_list_elements(this, &ir->body_instructions);