Extract rb_imemo_fields_clone2

Author: byroot

imemo.c

@@ -147,56 +147,46 @@ rb_imemo_fields_new_complex(VALUE klass, size_t capa)
     return imemo_fields_new_complex(klass, capa);
 }
 
-static int
-imemo_fields_trigger_wb_i(st_data_t key, st_data_t value, st_data_t arg)
-{
-    VALUE field_obj = (VALUE)arg;
-    RB_OBJ_WRITTEN(field_obj, Qundef, (VALUE)value);
-    return ST_CONTINUE;
-}
-
-static int
-imemo_fields_complex_wb_i(st_data_t key, st_data_t value, st_data_t arg)
-{
-    RB_OBJ_WRITTEN((VALUE)arg, Qundef, (VALUE)value);
-    return ST_CONTINUE;
-}
-
 VALUE
 rb_imemo_fields_new_complex_tbl(VALUE klass, st_table *tbl)
 {
     VALUE fields = imemo_fields_new(klass, sizeof(struct rb_fields));
     IMEMO_OBJ_FIELDS(fields)->as.complex.table = tbl;
-    st_foreach(tbl, imemo_fields_trigger_wb_i, (st_data_t)fields);
+    rb_gc_writebarrier_remember(fields);
     return fields;
 }
 
+VALUE
+rb_imemo_fields_clone2(VALUE fields_obj, size_t capa)
+{
+    shape_id_t shape_id = RBASIC_SHAPE_ID(fields_obj);
+    RUBY_ASSERT(!rb_shape_too_complex_p(shape_id));
+
+    VALUE clone = imemo_fields_new(CLASS_OF(fields_obj), capa);
+    VALUE *fields = rb_imemo_fields_ptr(clone);
+    attr_index_t fields_count = RSHAPE_LEN(shape_id);
+    MEMCPY(fields, rb_imemo_fields_ptr(fields_obj), VALUE, fields_count);
+    RBASIC_SET_SHAPE_ID(clone, shape_id);
+    rb_gc_writebarrier_remember(clone);
+
+    return clone;
+}
+
 VALUE
 rb_imemo_fields_clone(VALUE fields_obj)
 {
     shape_id_t shape_id = RBASIC_SHAPE_ID(fields_obj);
-    VALUE clone;
 
     if (rb_shape_too_complex_p(shape_id)) {
-        clone = rb_imemo_fields_new_complex(CLASS_OF(fields_obj), 0);
+        VALUE clone = rb_imemo_fields_new_complex(CLASS_OF(fields_obj), 0);
         RBASIC_SET_SHAPE_ID(clone, shape_id);
         st_table *src_table = rb_imemo_fields_complex_tbl(fields_obj);
         st_table *dest_table = rb_imemo_fields_complex_tbl(clone);
         st_replace(dest_table, src_table);
-        st_foreach(dest_table, imemo_fields_complex_wb_i, (st_data_t)clone);
-    }
-    else {
-        clone = imemo_fields_new(CLASS_OF(fields_obj), RSHAPE_CAPACITY(shape_id));
-        RBASIC_SET_SHAPE_ID(clone, shape_id);
-        VALUE *fields = rb_imemo_fields_ptr(clone);
-        attr_index_t fields_count = RSHAPE_LEN(shape_id);
-        MEMCPY(fields, rb_imemo_fields_ptr(fields_obj), VALUE, fields_count);
-        for (attr_index_t i = 0; i < fields_count; i++) {
-            RB_OBJ_WRITTEN(clone, Qundef, fields[i]);
-        }
+        rb_gc_writebarrier_remember(clone);
+        return clone;
     }
-
-    return clone;
+    return rb_imemo_fields_clone2(fields_obj, RSHAPE_CAPACITY(shape_id));
 }
 
 void

internal/imemo.h

@@ -282,6 +282,7 @@ VALUE rb_imemo_fields_new(VALUE klass, size_t capa);
 VALUE rb_imemo_fields_new_complex(VALUE klass, size_t capa);
 VALUE rb_imemo_fields_new_complex_tbl(VALUE klass, st_table *tbl);
 VALUE rb_imemo_fields_clone(VALUE fields_obj);
+VALUE rb_imemo_fields_clone2(VALUE fields_obj, size_t capa);
 void rb_imemo_fields_clear(VALUE fields_obj);
 
 static inline VALUE *

variable.c

@@ -1839,15 +1839,11 @@ generic_ivar_set(VALUE obj, ID id, VALUE val)
 
         if (next_capacity != current_capacity) {
             RUBY_ASSERT(next_capacity > current_capacity);
-
-            fields_obj = rb_imemo_fields_new(rb_obj_class(obj), next_capacity);
             if (original_fields_obj) {
-                attr_index_t fields_count = RSHAPE_LEN(current_shape_id);
-                VALUE *fields = rb_imemo_fields_ptr(fields_obj);
-                MEMCPY(fields, rb_imemo_fields_ptr(original_fields_obj), VALUE, fields_count);
-                for (attr_index_t i = 0; i < fields_count; i++) {
-                    RB_OBJ_WRITTEN(fields_obj, Qundef, fields[i]);
-                }
+                fields_obj = rb_imemo_fields_clone2(original_fields_obj, next_capacity);
+            }
+            else {
+                fields_obj = rb_imemo_fields_new(rb_obj_class(obj), next_capacity);
             }
         }
 
@@ -1922,14 +1918,12 @@ generic_field_set(VALUE obj, shape_id_t target_shape_id, VALUE val)
     else {
         attr_index_t index = RSHAPE_INDEX(target_shape_id);
         if (index >= RSHAPE_CAPACITY(current_shape_id)) {
-            fields_obj = rb_imemo_fields_new(rb_obj_class(obj), index);
+            attr_index_t next_capacity = RSHAPE_CAPACITY(target_shape_id);
             if (original_fields_obj) {
-                attr_index_t fields_count = RSHAPE_LEN(current_shape_id);
-                VALUE *fields = rb_imemo_fields_ptr(fields_obj);
-                MEMCPY(fields, rb_imemo_fields_ptr(original_fields_obj), VALUE, fields_count);
-                for (attr_index_t i = 0; i < fields_count; i++) {
-                    RB_OBJ_WRITTEN(fields_obj, Qundef, fields[i]);
-                }
+                fields_obj = rb_imemo_fields_clone2(original_fields_obj, next_capacity);
+            }
+            else {
+                fields_obj = rb_imemo_fields_new(rb_obj_class(obj), next_capacity);
             }
         }