Get rid of SHAPE_T_OBJECT

Now the `heap_index` is stored as flags inside `shape_id_t`.

This saves having to rebuild the entire tree when moving from one
slot size to the other.

Author: byroot

ext/objspace/objspace_dump.c

@@ -817,9 +817,6 @@ shape_id_i(shape_id_t shape_id, void *data)
         dump_append(dc, ",\"edge_name\":");
         dump_append_id(dc, shape->edge_name);
 
-        break;
-      case SHAPE_T_OBJECT:
-        dump_append(dc, ", \"shape_type\":\"T_OBJECT\"");
         break;
       case SHAPE_OBJ_ID:
         dump_append(dc, ", \"shape_type\":\"OBJ_ID\"");

gc.c

@@ -379,19 +379,7 @@ rb_gc_set_shape(VALUE obj, uint32_t shape_id)
 uint32_t
 rb_gc_rebuild_shape(VALUE obj, size_t heap_id)
 {
-    shape_id_t orig_shape_id = rb_obj_shape_id(obj);
-    if (rb_shape_too_complex_p(orig_shape_id)) {
-        return (uint32_t)orig_shape_id;
-    }
-
-    shape_id_t initial_shape_id = rb_shape_root(heap_id);
-    shape_id_t new_shape_id = rb_shape_traverse_from_new_root(initial_shape_id, orig_shape_id);
-
-    if (new_shape_id == INVALID_SHAPE_ID) {
-         return 0;
-     }
-
-    return (uint32_t)new_shape_id;
+    return (uint32_t)rb_shape_transition_heap(obj, heap_id);
 }
 
 void rb_vm_update_references(void *ptr);
@@ -1923,6 +1911,7 @@ object_id0(VALUE obj)
     // rb_shape_object_id_shape may lock if the current shape has
     // multiple children.
     shape_id_t object_id_shape_id = rb_shape_transition_object_id(obj);
+    RUBY_ASSERT(rb_shape_has_object_id(object_id_shape_id));
 
     id = generate_next_object_id();
     rb_obj_field_set(obj, object_id_shape_id, id);

internal/variable.h

@@ -70,7 +70,7 @@ VALUE rb_gvar_get(ID);
 VALUE rb_gvar_set(ID, VALUE);
 VALUE rb_gvar_defined(ID);
 void rb_const_warn_if_deprecated(const rb_const_entry_t *, VALUE, ID);
-void rb_ensure_iv_list_size(VALUE obj, uint32_t len, uint32_t newsize);
+void rb_ensure_iv_list_size(VALUE obj, uint32_t current_len, uint32_t newsize);
 attr_index_t rb_obj_ivar_set(VALUE obj, ID id, VALUE val);
 
 #endif /* INTERNAL_VARIABLE_H */

object.c

@@ -339,17 +339,16 @@ rb_obj_copy_ivar(VALUE dest, VALUE obj)
     shape_id_t dest_shape_id = src_shape_id;
     shape_id_t initial_shape_id = RBASIC_SHAPE_ID(dest);
 
-    if (RSHAPE(initial_shape_id)->heap_index != RSHAPE(src_shape_id)->heap_index || !rb_shape_canonical_p(src_shape_id)) {
-        RUBY_ASSERT(RSHAPE(initial_shape_id)->type == SHAPE_T_OBJECT);
+    RUBY_ASSERT(RSHAPE(initial_shape_id)->type == SHAPE_ROOT);
 
-        dest_shape_id = rb_shape_rebuild(initial_shape_id, src_shape_id);
-        if (UNLIKELY(rb_shape_too_complex_p(dest_shape_id))) {
-            st_table *table = rb_st_init_numtable_with_size(src_num_ivs);
-            rb_obj_copy_ivs_to_hash_table(obj, table);
-            rb_obj_init_too_complex(dest, table);
+    dest_shape_id = rb_shape_rebuild(initial_shape_id, src_shape_id);
 
-            return;
-        }
+    if (UNLIKELY(rb_shape_too_complex_p(dest_shape_id))) {
+        st_table *table = rb_st_init_numtable_with_size(src_num_ivs);
+        rb_obj_copy_ivs_to_hash_table(obj, table);
+        rb_obj_init_too_complex(dest, table);
+
+        return;
     }
 
     VALUE *src_buf = ROBJECT_FIELDS(obj);
@@ -358,14 +357,13 @@ rb_obj_copy_ivar(VALUE dest, VALUE obj)
     attr_index_t initial_capa = RSHAPE_CAPACITY(initial_shape_id);
     attr_index_t dest_capa = RSHAPE_CAPACITY(dest_shape_id);
 
-    RUBY_ASSERT(src_num_ivs <= initial_capa);
     if (initial_capa < dest_capa) {
-        rb_ensure_iv_list_size(dest, initial_capa, dest_capa);
+        rb_ensure_iv_list_size(dest, 0, dest_capa);
         dest_buf = ROBJECT_FIELDS(dest);
     }
 
     rb_shape_copy_fields(dest, dest_buf, dest_shape_id, obj, src_buf, src_shape_id);
-    rb_obj_set_shape_id(dest, dest_shape_id);
+    RBASIC_SET_SHAPE_ID(dest, dest_shape_id);
 }
 
 static void

proc.c

@@ -298,10 +298,8 @@ rb_binding_alloc(VALUE klass)
     return obj;
 }
 
-
-/* :nodoc: */
 static VALUE
-binding_dup(VALUE self)
+binding_copy(VALUE self)
 {
     VALUE bindval = rb_binding_alloc(rb_cBinding);
     rb_binding_t *src, *dst;
@@ -310,15 +308,21 @@ binding_dup(VALUE self)
     rb_vm_block_copy(bindval, &dst->block, &src->block);
     RB_OBJ_WRITE(bindval, &dst->pathobj, src->pathobj);
     dst->first_lineno = src->first_lineno;
-    return rb_obj_dup_setup(self, bindval);
+    return bindval;
+}
+
+/* :nodoc: */
+static VALUE
+binding_dup(VALUE self)
+{
+    return rb_obj_dup_setup(self, binding_copy(self));
 }
 
 /* :nodoc: */
 static VALUE
 binding_clone(VALUE self)
 {
-    VALUE bindval = binding_dup(self);
-    return rb_obj_clone_setup(self, bindval, Qnil);
+    return rb_obj_clone_setup(self, binding_copy(self), Qnil);
 }
 
 VALUE