Embed vm->unused_block_warning_table

Author: byroot

compile.c

@@ -2058,7 +2058,7 @@ iseq_set_use_block(rb_iseq_t *iseq)
 
         if (!rb_warning_category_enabled_p(RB_WARN_CATEGORY_STRICT_UNUSED_BLOCK)) {
             st_data_t key = (st_data_t)rb_intern_str(body->location.label); // String -> ID
-            set_insert(vm->unused_block_warning_table, key);
+            set_insert(&vm->unused_block_warning_table, key);
         }
     }
 }

internal/set_table.h

@@ -42,6 +42,8 @@ set_table *rb_set_init_table_with_size(set_table *tab, const struct st_hash_type
 set_table *rb_set_init_numtable(void);
 #define set_init_numtable_with_size rb_set_init_numtable_with_size
 set_table *rb_set_init_numtable_with_size(st_index_t size);
+#define set_init_embedded_numtable_with_size rb_set_init_embedded_numtable_with_size
+set_table *rb_set_init_embedded_numtable_with_size(struct set_table *tbl, st_index_t size);
 #define set_table_delete rb_set_table_delete
 int rb_set_table_delete(set_table *, st_data_t *); /* returns 0:notfound 1:deleted */
 #define set_insert rb_set_insert

st.c

@@ -2559,6 +2559,12 @@ set_init_numtable_with_size(st_index_t size)
     return set_init_table_with_size(NULL, &type_numhash, size);
 }
 
+set_table *
+set_init_embedded_numtable_with_size(set_table *tab, st_index_t size)
+{
+    return set_init_existing_table_with_size(tab, &type_numhash, size);
+}
+
 size_t
 set_table_size(const struct set_table *tbl)
 {

vm.c

@@ -3396,7 +3396,7 @@ ruby_vm_destruct(rb_vm_t *vm)
             st_free_table(vm->static_ext_inits);
 
             rb_id_table_free_items(&vm->constant_cache);
-            set_free_table(vm->unused_block_warning_table);
+            set_free_embedded_table(&vm->unused_block_warning_table);
 
             rb_thread_free_native_thread(th);
 
@@ -4586,7 +4586,7 @@ Init_BareVM(void)
     rb_objspace_alloc();
     rb_id_table_init(&vm->negative_cme_table, 16);
     st_init_existing_numtable_with_size(&vm->overloaded_cme_table, 0);
-    vm->unused_block_warning_table = set_init_numtable();
+    set_init_embedded_numtable_with_size(&vm->unused_block_warning_table, 0);
     vm->global_hooks.type = hook_list_type_global;
 
     // setup main thread

vm_core.h

@@ -815,7 +815,7 @@ typedef struct rb_vm_struct {
     st_table *ci_table;
     struct rb_id_table negative_cme_table;
     st_table overloaded_cme_table; // cme -> overloaded_cme
-    set_table *unused_block_warning_table;
+    set_table unused_block_warning_table;
     VALUE cc_refinement_set;
 
     // This id table contains a mapping from ID to ICs. It does this with ID

vm_insnhelper.c

@@ -3143,7 +3143,7 @@ static void
 warn_unused_block(const rb_callable_method_entry_t *cme, const rb_iseq_t *iseq, void *pc)
 {
     rb_vm_t *vm = GET_VM();
-    set_table *dup_check_table = vm->unused_block_warning_table;
+    set_table *dup_check_table = &vm->unused_block_warning_table;
     st_data_t key;
     bool strict_unused_block = rb_warning_category_enabled_p(RB_WARN_CATEGORY_STRICT_UNUSED_BLOCK);