Get rid of generic_fields_tbl

Author: byroot

variable.c

@@ -1185,24 +1185,23 @@ IVAR_ACCESSOR_SHOULD_BE_MAIN_RACTOR(ID id)
       rb_raise(rb_eRactorIsolationError, "can not access class variables from non-main Ractors"); \
   }
 
-static inline struct st_table *
-generic_fields_tbl(VALUE obj, ID id, bool force_check_ractor)
+static inline void
+ivar_ractor_check(VALUE obj, ID id)
 {
-    ASSERT_vm_locking();
-
-    if ((force_check_ractor || LIKELY(rb_is_instance_id(id)) /* not internal ID */ )  &&
+    if (LIKELY(rb_is_instance_id(id)) /* not internal ID */ &&
         !RB_OBJ_FROZEN_RAW(obj) &&
         UNLIKELY(!rb_ractor_main_p()) &&
         UNLIKELY(rb_ractor_shareable_p(obj))) {
 
         rb_raise(rb_eRactorIsolationError, "can not access instance variables of shareable objects from non-main Ractors");
     }
-    return generic_fields_tbl_;
 }
 
 static inline struct st_table *
 generic_fields_tbl_no_ractor_check(void)
 {
+    ASSERT_vm_locking();
+
     return generic_fields_tbl_;
 }
 
@@ -1213,13 +1212,14 @@ rb_generic_fields_tbl_get(void)
 }
 
 VALUE
-rb_obj_fields(VALUE obj, ID id)
+rb_obj_fields(VALUE obj, ID field_name)
 {
+    ivar_ractor_check(obj, field_name);
+
     VALUE fields_obj = 0;
     if (rb_obj_exivar_p(obj)) {
         RB_VM_LOCKING() {
-            st_table *tbl = generic_fields_tbl(obj, id, false);
-            if (!st_lookup(tbl, (st_data_t)obj, (st_data_t *)&fields_obj)) {
+            if (!st_lookup(generic_fields_tbl_, (st_data_t)obj, (st_data_t *)&fields_obj)) {
                 rb_bug("Object is missing entry in generic_fields_tbl");
             }
         }
@@ -1242,14 +1242,15 @@ rb_free_generic_ivar(VALUE obj)
 void
 rb_obj_set_fields(VALUE obj, VALUE fields_obj, ID field_name, VALUE original_fields_obj)
 {
+    ivar_ractor_check(obj, field_name);
+
     RUBY_ASSERT(!fields_obj || IMEMO_TYPE_P(fields_obj, imemo_fields));
     RUBY_ASSERT(!original_fields_obj || IMEMO_TYPE_P(original_fields_obj, imemo_fields));
 
     if (fields_obj != original_fields_obj) {
         if (fields_obj) {
             RB_VM_LOCKING() {
-                st_table *tbl = generic_fields_tbl(obj, field_name, false);
-                st_insert(tbl, (st_data_t)obj, (st_data_t)fields_obj);
+                st_insert(generic_fields_tbl_, (st_data_t)obj, (st_data_t)fields_obj);
             }
 
             RB_OBJ_WRITTEN(obj, original_fields_obj, fields_obj);