Embed vm->overloaded_cme_table

Author: byroot

gc.c

@@ -4204,14 +4204,12 @@ rb_gc_vm_weak_table_foreach(vm_table_foreach_callback_func callback,
         break;
       }
       case RB_GC_VM_OVERLOADED_CME_TABLE: {
-        if (vm->overloaded_cme_table) {
-            st_foreach_with_replace(
-                vm->overloaded_cme_table,
-                vm_weak_table_foreach_weak_key,
-                vm_weak_table_foreach_update_weak_key,
-                (st_data_t)&foreach_data
-            );
-        }
+        st_foreach_with_replace(
+            &vm->overloaded_cme_table,
+            vm_weak_table_foreach_weak_key,
+            vm_weak_table_foreach_update_weak_key,
+            (st_data_t)&foreach_data
+        );
         break;
       }
       case RB_GC_VM_GLOBAL_SYMBOLS_TABLE: {

internal/st.h

@@ -8,6 +8,9 @@ st_table *rb_st_replace(st_table *new_tab, st_table *old_tab);
 st_table *rb_st_init_existing_table_with_size(st_table *tab, const struct st_hash_type *type, st_index_t size);
 #define st_init_existing_table_with_size rb_st_init_existing_table_with_size
 
+st_table *rb_st_init_existing_numtable_with_size(st_table *tab, st_index_t size);
+#define st_init_existing_numtable_with_size rb_st_init_existing_numtable_with_size
+
 void rb_st_free_embedded_table(st_table *tab);
 #define st_free_embedded_table rb_st_free_embedded_table
 

parser_st.c

@@ -80,6 +80,8 @@ nonempty_memcpy(void *dest, const void *src, size_t n)
 #define st_init_table_with_size rb_parser_st_init_table_with_size
 #undef st_init_existing_table_with_size
 #define st_init_existing_table_with_size rb_parser_st_init_existing_table_with_size
+#undef st_init_existing_numtable_with_size
+#define st_init_existing_numtable_with_size rb_parser_st_init_existing_numtable_with_size
 #undef st_free_embedded_table
 #define st_free_embedded_table rb_parser_st_free_embedded_table
 #undef st_insert

st.c

@@ -577,6 +577,12 @@ st_init_existing_table_with_size(st_table *tab, const struct st_hash_type *type,
     return tab;
 }
 
+st_table *
+st_init_existing_numtable_with_size(st_table *tab, st_index_t size)
+{
+    return st_init_existing_table_with_size(tab, &type_numhash, size);
+}
+
 /* Create and return table with TYPE which can hold at least SIZE
    entries.  The real number of entries which the table can hold is
    the nearest power of two for SIZE.  */

vm.c

@@ -26,6 +26,7 @@
 #include "internal/proc.h"
 #include "internal/re.h"
 #include "internal/ruby_parser.h"
+#include "internal/st.h"
 #include "internal/symbol.h"
 #include "internal/thread.h"
 #include "internal/transcode.h"
@@ -3332,7 +3333,7 @@ rb_vm_mark(void *ptr)
         rb_hook_list_mark(&vm->global_hooks);
 
         rb_id_table_foreach_values(&vm->negative_cme_table, vm_mark_negative_cme, NULL);
-        rb_mark_tbl_no_pin(vm->overloaded_cme_table);
+        rb_mark_tbl_no_pin(&vm->overloaded_cme_table);
         for (i=0; i<VM_GLOBAL_CC_CACHE_TABLE_SIZE; i++) {
             const struct rb_callcache *cc = vm->global_cc_cache_table[i];
 
@@ -3387,7 +3388,7 @@ ruby_vm_destruct(rb_vm_t *vm)
             rb_free_rb_global_tbl();
 
             rb_id_table_free_items(&vm->negative_cme_table);
-            st_free_table(vm->overloaded_cme_table);
+            st_free_embedded_table(&vm->overloaded_cme_table);
 
             // TODO: Is this ignorable for classext->m_tbl ?
             // rb_id_table_free(RCLASS(rb_mRubyVMFrozenCore)->m_tbl);
@@ -3507,7 +3508,7 @@ vm_memsize(const void *ptr)
         rb_st_memsize(vm->ci_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) +
+        (rb_st_memsize(&vm->overloaded_cme_table) - sizeof(struct st_table)) +
         vm_memsize_constant_cache()
     );
 
@@ -4584,7 +4585,7 @@ Init_BareVM(void)
     ruby_current_vm_ptr = vm;
     rb_objspace_alloc();
     rb_id_table_init(&vm->negative_cme_table, 16);
-    vm->overloaded_cme_table = st_init_numtable();
+    st_init_existing_numtable_with_size(&vm->overloaded_cme_table, 0);
     vm->unused_block_warning_table = set_init_numtable();
     vm->global_hooks.type = hook_list_type_global;
 

vm_core.h

@@ -814,7 +814,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
+    st_table overloaded_cme_table; // cme -> overloaded_cme
     set_table *unused_block_warning_table;
     VALUE cc_refinement_set;
 

vm_method.c

@@ -1506,8 +1506,7 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
 static st_table *
 overloaded_cme_table(void)
 {
-    VM_ASSERT(GET_VM()->overloaded_cme_table != NULL);
-    return GET_VM()->overloaded_cme_table;
+    return &GET_VM()->overloaded_cme_table;
 }
 
 #if VM_CHECK_MODE > 0