rb_obj_set_fields forward shape_id

Author: byroot

variable.c

@@ -1275,6 +1275,8 @@ rb_obj_set_fields(VALUE obj, VALUE fields_obj, ID field_name, VALUE original_fie
             rb_imemo_fields_clear(original_fields_obj);
         }
     }
+
+    RBASIC_SET_SHAPE_ID(obj, RBASIC_SHAPE_ID(fields_obj));
 }
 
 void
@@ -1637,7 +1639,6 @@ 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);
             rb_obj_replace_fields(obj, fields_obj, 0);
-            RBASIC_SET_SHAPE_ID(obj, shape_id);
         }
     }
 
@@ -1889,13 +1890,7 @@ generic_field_set(VALUE obj, shape_id_t target_shape_id, ID field_name, VALUE va
     const VALUE original_fields_obj = rb_obj_fields(obj, field_name);
     VALUE fields_obj = imemo_fields_set(rb_obj_class(obj), original_fields_obj, target_shape_id, field_name, val, false);
 
-    rb_obj_replace_fields(obj, fields_obj, field_name);
-
-    if (RBASIC_SHAPE_ID(fields_obj) == target_shape_id) {
-        RBASIC_SET_SHAPE_ID(obj, target_shape_id);
-    }
-
-    RUBY_ASSERT(RBASIC_SHAPE_ID(obj) == RBASIC_SHAPE_ID(fields_obj));
+    rb_obj_set_fields(obj, fields_obj, field_name, original_fields_obj);
 }
 
 static shape_id_t