Explict use of rb_obj_fields_no_ractor_check

Author: byroot

gc.c

@@ -3087,7 +3087,7 @@ rb_gc_mark_children(void *objspace, VALUE obj)
     struct gc_mark_classext_foreach_arg foreach_args;
 
     if (rb_obj_exivar_p(obj)) {
-        gc_mark_internal(rb_obj_fields(obj, 0));
+        gc_mark_internal(rb_obj_fields_no_ractor_check(obj));
     }
 
     switch (BUILTIN_TYPE(obj)) {

ractor.c

@@ -1679,7 +1679,7 @@ obj_traverse_replace_i(VALUE obj, struct obj_traverse_replace_data *data)
 } while (0)
 
     if (UNLIKELY(rb_obj_exivar_p(obj))) {
-        VALUE fields_obj = rb_obj_fields(obj, 0);
+        VALUE fields_obj = rb_obj_fields_no_ractor_check(obj);
 
         if (UNLIKELY(rb_shape_obj_too_complex_p(obj))) {
             struct obj_traverse_replace_callback_data d = {

variable.c

@@ -1227,12 +1227,6 @@ rb_obj_fields(VALUE obj, ID id)
     return fields_obj;
 }
 
-VALUE
-rb_obj_fields_no_ractor_check(VALUE obj)
-{
-    return rb_obj_fields(obj, 0);
-}
-
 void
 rb_free_generic_ivar(VALUE obj)
 {
@@ -1576,7 +1570,7 @@ rb_ivar_delete(VALUE obj, ID id, VALUE undef)
             break;
 
           default: {
-            VALUE fields_obj = rb_obj_fields(obj, 0);
+            VALUE fields_obj = rb_obj_fields(obj, id);
             table = rb_imemo_fields_complex_tbl(fields_obj);
             break;
           }
@@ -2138,7 +2132,7 @@ ivar_defined0(VALUE obj, ID id)
             break;
 
           default: {
-            VALUE fields_obj = rb_obj_fields(obj, 0);
+            VALUE fields_obj = rb_obj_fields_no_ractor_check(obj); // defined? doesn't require ractor checks
             table = rb_imemo_fields_complex_tbl(fields_obj);
           }
         }
@@ -2290,7 +2284,7 @@ rb_copy_generic_ivar(VALUE dest, VALUE obj)
 
     shape_id_t src_shape_id = rb_obj_shape_id(obj);
 
-    VALUE fields_obj = rb_obj_fields(obj, 0);
+    VALUE fields_obj = rb_obj_fields_no_ractor_check(obj);
     if (fields_obj) {
         unsigned long src_num_ivs = rb_ivar_count(fields_obj);
         if (!src_num_ivs) {
@@ -2381,7 +2375,7 @@ rb_field_foreach(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg,
         break;
       default:
         {
-            VALUE fields_obj = rb_obj_fields(obj, 0);
+            VALUE fields_obj = rb_obj_fields_no_ractor_check(obj);
             if (fields_obj) {
                 imemo_fields_each(fields_obj, func, arg, ivar_only);
             }
@@ -2436,7 +2430,7 @@ rb_ivar_count(VALUE obj)
 
       default:
         {
-            VALUE fields_obj = rb_obj_fields(obj, 0);
+            VALUE fields_obj = rb_obj_fields_no_ractor_check(obj);
             if (fields_obj) {
                 if (rb_shape_obj_too_complex_p(fields_obj)) {
                     rb_st_table_size(rb_imemo_fields_complex_tbl(fields_obj));

variable.h

@@ -15,6 +15,12 @@
 void rb_copy_complex_ivars(VALUE dest, VALUE obj, shape_id_t src_shape_id, st_table *fields_table);
 VALUE rb_obj_fields(VALUE obj, ID field_name);
 
+static inline VALUE
+rb_obj_fields_no_ractor_check(VALUE obj)
+{
+    return rb_obj_fields(obj, 0);
+}
+
 void rb_free_rb_global_tbl(void);
 void rb_free_generic_fields_tbl_(void);
 

vm_insnhelper.c

@@ -1343,7 +1343,7 @@ vm_getivar(VALUE obj, ID id, const rb_iseq_t *iseq, IVC ic, const struct rb_call
                 break;
 
               default: {
-                VALUE fields_obj = rb_obj_fields(obj, 0);
+                VALUE fields_obj = rb_obj_fields(obj, id);
                 table = rb_imemo_fields_complex_tbl(fields_obj);
                 break;
               }