Embed vm->ci_table

Author: byroot

gc.c

@@ -4193,14 +4193,12 @@ rb_gc_vm_weak_table_foreach(vm_table_foreach_callback_func callback,
 
     switch (table) {
       case RB_GC_VM_CI_TABLE: {
-        if (vm->ci_table) {
-            st_foreach_with_replace(
-                vm->ci_table,
-                vm_weak_table_foreach_weak_key,
-                vm_weak_table_foreach_update_weak_key,
-                (st_data_t)&foreach_data
-            );
-        }
+        st_foreach_with_replace(
+            &vm->ci_table,
+            vm_weak_table_foreach_weak_key,
+            vm_weak_table_foreach_update_weak_key,
+            (st_data_t)&foreach_data
+        );
         break;
       }
       case RB_GC_VM_OVERLOADED_CME_TABLE: {

vm.c

@@ -3413,10 +3413,7 @@ ruby_vm_destruct(rb_vm_t *vm)
 
         rb_vm_living_threads_init(vm);
         ruby_vm_run_at_exit_hooks(vm);
-        if (vm->ci_table) {
-            st_free_table(vm->ci_table);
-            vm->ci_table = NULL;
-        }
+        st_free_embedded_table(&vm->ci_table);
         RB_ALTSTACK_FREE(vm->main_altstack);
 
         struct global_object_list *next;
@@ -3505,7 +3502,7 @@ vm_memsize(const void *ptr)
         rb_vm_memsize_postponed_job_queue() +
         rb_vm_memsize_workqueue(&vm->workqueue) +
         vm_memsize_at_exit_list(vm->at_exit) +
-        rb_st_memsize(vm->ci_table) +
+        (rb_st_memsize(&vm->ci_table) - sizeof(struct st_table)) +
         vm_memsize_builtin_function_table(vm->builtin_function_table) +
         (rb_id_table_memsize(&vm->negative_cme_table) - sizeof(struct rb_id_table)) +
         (rb_st_memsize(&vm->overloaded_cme_table) - sizeof(struct st_table)) +
@@ -4741,7 +4738,7 @@ Init_vm_objects(void)
 
     /* initialize mark object array, hash */
     vm->mark_object_ary = pin_array_list_new(Qnil);
-    vm->ci_table = st_init_table(&vm_ci_hashtype);
+    st_init_existing_table_with_size(&vm->ci_table, &vm_ci_hashtype, 0);
     vm->cc_refinement_set = rb_cc_refinement_set_create();
 }
 

vm_core.h

@@ -812,7 +812,7 @@ typedef struct rb_vm_struct {
 
     const struct rb_builtin_function *builtin_function_table;
 
-    st_table *ci_table;
+    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;

vm_method.c

@@ -672,8 +672,7 @@ rb_vm_ci_lookup(ID mid, unsigned int flag, unsigned int argc, const struct rb_ca
     new_ci->argc = argc;
 
     RB_VM_LOCKING() {
-        st_table *ci_table = vm->ci_table;
-        VM_ASSERT(ci_table);
+        st_table *ci_table = &vm->ci_table;
 
         do {
             st_update(ci_table, (st_data_t)new_ci, ci_lookup_i, (st_data_t)&ci);
@@ -693,7 +692,7 @@ rb_vm_ci_free(const struct rb_callinfo *ci)
     rb_vm_t *vm = GET_VM();
 
     st_data_t key = (st_data_t)ci;
-    st_delete(vm->ci_table, &key, NULL);
+    st_delete(&vm->ci_table, &key, NULL);
 }
 
 struct cc_refinement_entries {