Extract generic_fields_insert / generic_fields_lookup

Author: byroot

gc.c

@@ -2059,7 +2059,7 @@ rb_gc_obj_free_vm_weak_references(VALUE obj)
     obj_free_object_id(obj);
 
     if (rb_obj_exivar_p(obj)) {
-        rb_free_generic_ivar((VALUE)obj);
+        rb_free_generic_ivar(obj);
     }
 
     switch (BUILTIN_TYPE(obj)) {

variable.c

@@ -1197,6 +1197,29 @@ rb_generic_fields_tbl_get(void)
     return generic_fields_tbl_;
 }
 
+static inline VALUE
+generic_fields_lookup(VALUE obj, ID id, bool force_check_ractor)
+{
+    VALUE fields_obj = Qfalse;
+    RB_VM_LOCKING() {
+        st_table *generic_tbl = generic_fields_tbl(obj, id, false);
+        st_lookup(generic_tbl, obj, (st_data_t *)&fields_obj);
+    }
+    return fields_obj;
+}
+
+static inline void
+generic_fields_insert(VALUE obj, VALUE fields_obj)
+{
+    RUBY_ASSERT(IMEMO_TYPE_P(fields_obj, imemo_fields));
+
+    RB_VM_LOCKING() {
+        st_table *generic_tbl = generic_fields_tbl_no_ractor_check(obj);
+        st_insert(generic_tbl, obj, fields_obj);
+    }
+    RB_OBJ_WRITTEN(obj, Qundef, fields_obj);
+}
+
 int
 rb_gen_fields_tbl_get(VALUE obj, ID id, VALUE *fields_obj)
 {
@@ -1566,6 +1589,8 @@ rb_attr_delete(VALUE obj, ID id)
     return rb_ivar_delete(obj, id, Qnil);
 }
 
+static inline void generic_update_fields_obj(VALUE obj, VALUE fields_obj, const VALUE original_fields_obj);
+
 static shape_id_t
 obj_transition_too_complex(VALUE obj, st_table *table)
 {
@@ -1599,12 +1624,11 @@ obj_transition_too_complex(VALUE obj, st_table *table)
             VALUE fields_obj = rb_imemo_fields_new_complex_tbl(rb_obj_class(obj), table);
             RBASIC_SET_SHAPE_ID(fields_obj, shape_id);
 
-            struct st_table *gen_fields_tbl = generic_fields_tbl_no_ractor_check(obj);
             RB_VM_LOCKING() {
-                st_insert(gen_fields_tbl, (st_data_t)obj, (st_data_t)fields_obj);
+                const VALUE original_fields_obj = generic_fields_lookup(obj, 0, false);
+                generic_update_fields_obj(obj, fields_obj, original_fields_obj);
             }
             RBASIC_SET_SHAPE_ID(obj, shape_id);
-            RB_OBJ_WRITTEN(obj, Qundef, fields_obj);
         }
     }
 
@@ -1758,17 +1782,25 @@ general_field_set(VALUE obj, shape_id_t target_shape_id, VALUE val, void *data,
     }
 }
 
+static inline void
+generic_update_fields_obj(VALUE obj, VALUE fields_obj, const VALUE original_fields_obj)
+{
+    if (fields_obj != original_fields_obj) {
+        if (original_fields_obj) {
+            // Clear root shape to avoid triggering cleanup such as free_object_id.
+            RBASIC_SET_SHAPE_ID(original_fields_obj, ROOT_SHAPE_ID);
+        }
+
+        generic_fields_insert(obj, fields_obj);
+    }
+}
+
 static void
 generic_ivar_set(VALUE obj, ID id, VALUE val)
 {
-    VALUE fields_obj = 0;
-    st_table *generic_tbl;
     bool existing = true;
 
-    RB_VM_LOCKING() {
-        generic_tbl = generic_fields_tbl(obj, id, false);
-        st_lookup(generic_tbl, obj, (st_data_t *)&fields_obj);
-    }
+    VALUE fields_obj = generic_fields_lookup(obj, id, false);
 
     const VALUE original_fields_obj = fields_obj;
     if (!fields_obj) {
@@ -1831,17 +1863,7 @@ generic_ivar_set(VALUE obj, ID id, VALUE val)
         RBASIC_SET_SHAPE_ID(fields_obj, next_shape_id);
     }
 
-    if (fields_obj != original_fields_obj) {
-        RB_VM_LOCKING() {
-            st_insert(generic_tbl, obj, fields_obj);
-        }
-        RB_OBJ_WRITTEN(obj, original_fields_obj, fields_obj);
-
-        if (original_fields_obj) {
-            // Clear root shape to avoid triggering cleanup such as free_object_id.
-            RBASIC_SET_SHAPE_ID(original_fields_obj, ROOT_SHAPE_ID);
-        }
-    }
+    generic_update_fields_obj(obj, fields_obj, original_fields_obj);
 
     if (!existing) {
         RBASIC_SET_SHAPE_ID(obj, next_shape_id);
@@ -1857,17 +1879,8 @@ generic_ivar_set(VALUE obj, ID id, VALUE val)
         existing = st_insert(table, (st_data_t)id, (st_data_t)val);
         RB_OBJ_WRITTEN(fields_obj, Qundef, val);
 
-        if (fields_obj != original_fields_obj) {
-            RB_VM_LOCKING() {
-                st_insert(generic_tbl, obj, fields_obj);
-            }
-            RB_OBJ_WRITTEN(obj, original_fields_obj, fields_obj);
+        generic_update_fields_obj(obj, fields_obj, original_fields_obj);
 
-            if (original_fields_obj) {
-                // Clear root shape to avoid triggering cleanup such as free_object_id.
-                RBASIC_SET_SHAPE_ID(original_fields_obj, ROOT_SHAPE_ID);
-            }
-        }
         if (!existing) {
             RBASIC_SET_SHAPE_ID(obj, next_shape_id);
         }
@@ -1881,15 +1894,9 @@ generic_ivar_set(VALUE obj, ID id, VALUE val)
 static void
 generic_field_set(VALUE obj, shape_id_t target_shape_id, VALUE val)
 {
-    VALUE fields_obj = 0;
-    st_table *generic_tbl;
     bool existing = true;
 
-    RB_VM_LOCKING() {
-        generic_tbl = generic_fields_tbl(obj, RSHAPE_EDGE_NAME(target_shape_id), false);
-        st_lookup(generic_tbl, obj, (st_data_t *)&fields_obj);
-    }
-
+    VALUE fields_obj = generic_fields_lookup(obj, RSHAPE_EDGE_NAME(target_shape_id), false);
     const VALUE original_fields_obj = fields_obj;
 
     shape_id_t current_shape_id = fields_obj ? RBASIC_SHAPE_ID(fields_obj) : ROOT_SHAPE_ID;
@@ -1908,10 +1915,10 @@ generic_field_set(VALUE obj, shape_id_t target_shape_id, VALUE val)
         existing = false;
         st_table *table = rb_imemo_fields_complex_tbl(fields_obj);
 
-        RBASIC_SET_SHAPE_ID(fields_obj, target_shape_id);
         RUBY_ASSERT(RSHAPE_EDGE_NAME(target_shape_id));
         st_insert(table, (st_data_t)RSHAPE_EDGE_NAME(target_shape_id), (st_data_t)val);
         RB_OBJ_WRITTEN(fields_obj, Qundef, val);
+        RBASIC_SET_SHAPE_ID(fields_obj, target_shape_id);
     }
     else {
         attr_index_t index = RSHAPE_INDEX(target_shape_id);
@@ -1927,26 +1934,16 @@ generic_field_set(VALUE obj, shape_id_t target_shape_id, VALUE val)
             }
         }
 
+        VALUE *table = rb_imemo_fields_ptr(fields_obj);
+        RB_OBJ_WRITE(fields_obj, &table[index], val);
+
         if (RSHAPE_LEN(target_shape_id) > RSHAPE_LEN(current_shape_id)) {
             existing = false;
             RBASIC_SET_SHAPE_ID(fields_obj, target_shape_id);
         }
-
-        VALUE *table = rb_imemo_fields_ptr(fields_obj);
-        RB_OBJ_WRITE(fields_obj, &table[index], val);
     }
 
-    if (fields_obj != original_fields_obj) {
-        RB_VM_LOCKING() {
-            st_insert(generic_tbl, obj, fields_obj);
-        }
-        RB_OBJ_WRITTEN(obj, original_fields_obj, fields_obj);
-
-        if (original_fields_obj) {
-            // Clear root shape to avoid triggering cleanup such as free_object_id.
-            RBASIC_SET_SHAPE_ID(original_fields_obj, ROOT_SHAPE_ID);
-        }
-    }
+    generic_update_fields_obj(obj, fields_obj, original_fields_obj);
 
     if (!existing) {
         RBASIC_SET_SHAPE_ID(obj, target_shape_id);