Make rb_shape.capacity an attr_index_t

Author: byroot

shape.h

@@ -45,7 +45,7 @@ struct rb_shape {
     struct rb_id_table *edges; // id_table from ID (ivar) to next shape
     ID edge_name; // ID (ivar) for transition from parent to rb_shape
     attr_index_t next_iv_index;
-    uint32_t capacity; // Total capacity of the object with this shape
+    attr_index_t capacity; // Total capacity of the object with this shape
     uint8_t type;
     uint8_t heap_index;
     shape_id_t parent_id;
@@ -104,19 +104,45 @@ set_shape_id_in_flags(VALUE obj, shape_id_t shape_id)
 }
 
 
-#if SHAPE_IN_BASIC_FLAGS
 static inline shape_id_t
 RBASIC_SHAPE_ID(VALUE obj)
 {
+#if SHAPE_IN_BASIC_FLAGS
     return get_shape_id_from_flags(obj);
+#else
+    switch (BUILTIN_TYPE(obj)) {
+      case T_OBJECT:
+        ROBJECT_SET_SHAPE_ID(obj, shape_id);
+        break;
+      case T_CLASS:
+      case T_MODULE:
+        RCLASS_SET_SHAPE_ID(obj, shape_id);
+        break;
+      default:
+        if (shape_id != SPECIAL_CONST_SHAPE_ID) {
+            struct gen_ivtbl *ivtbl = 0;
+            RB_VM_LOCK_ENTER();
+            {
+                st_table* global_iv_table = generic_ivtbl(obj, 0, false);
+
+                if (st_lookup(global_iv_table, obj, (st_data_t *)&ivtbl)) {
+                    ivtbl->shape_id = shape_id;
+                }
+                else {
+                    rb_bug("Expected shape_id entry in global iv table");
+                }
+            }
+            RB_VM_LOCK_LEAVE();
+        }
+    }
+#endif
 }
 
 static inline void
 RBASIC_SET_SHAPE_ID(VALUE obj, shape_id_t shape_id)
 {
     set_shape_id_in_flags(obj, shape_id);
 }
-#endif
 
 static inline shape_id_t
 ROBJECT_SHAPE_ID(VALUE obj)