More complex class updates

Author: byroot

imemo.c

@@ -133,6 +133,7 @@ VALUE
 rb_imemo_class_fields_new_complex(VALUE klass, st_table *tbl)
 {
     VALUE fields = rb_imemo_class_fields_new(klass, sizeof(tbl));
+    FL_SET_RAW(fields, OBJ_FIELD_COMPLEX);
     IMEMO_OBJ_FIELDS(fields)->as.complex.table = tbl;
     return fields;
 }

internal/class.h

@@ -217,7 +217,7 @@ static inline void RCLASSEXT_SET_INCLUDER(rb_classext_t *ext, VALUE klass, VALUE
 // To invalidate CC by inserting&invalidating method entry into tables containing the target cme
 // See clear_method_cache_by_id_in_class()
 #define RCLASS_PRIME_FIELDS(c) (rb_imemo_class_fields_ptr(RCLASS_EXT_PRIME(c)->fields_obj))
-#define RCLASS_PRIME_FIELDS_VALUE(c) (RCLASS_EXT_PRIME(c)->fields_obj)
+#define RCLASS_PRIME_FIELDS_OBJ(c) (RCLASS_EXT_PRIME(c)->fields_obj)
 
 static inline void
 RCLASS_PRIME_SET_FIELDS_OBJ(VALUE klass, VALUE fields)
@@ -270,8 +270,8 @@ RCLASS_PRIME_SET_FIELDS_OBJ(VALUE klass, VALUE fields)
 
 static inline void RCLASS_SET_SUPER(VALUE klass, VALUE super);
 static inline void RCLASS_WRITE_SUPER(VALUE klass, VALUE super);
-static inline st_table * RCLASS_FIELDS_HASH(VALUE obj);
-static inline st_table * RCLASS_WRITABLE_FIELDS_HASH(VALUE obj);
+static inline st_table *RCLASS_FIELDS_HASH(VALUE obj);
+static inline st_table *RCLASS_WRITABLE_FIELDS_HASH(VALUE obj);
 static inline uint32_t RCLASS_FIELDS_COUNT(VALUE obj);
 static inline void RCLASS_SET_FIELDS_HASH(VALUE obj, st_table *table);
 static inline void RCLASS_WRITE_FIELDS_HASH(VALUE obj, st_table *table);
@@ -551,15 +551,18 @@ RCLASS_FIELDS_HASH(VALUE obj)
 {
     RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
     RUBY_ASSERT(rb_shape_obj_too_complex_p(obj));
-    return (st_table *)RCLASSEXT_FIELDS(RCLASS_EXT_READABLE(obj));
+    VALUE fields_obj = RCLASS_EXT_READABLE(obj)->fields_obj;
+    return rb_imemo_class_fields_complex_tbl(fields_obj);
 }
 
 static inline st_table *
 RCLASS_WRITABLE_FIELDS_HASH(VALUE obj)
 {
     RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
     RUBY_ASSERT(rb_shape_obj_too_complex_p(obj));
-    return (st_table *)RCLASSEXT_FIELDS(RCLASS_EXT_WRITABLE(obj));
+
+    VALUE fields_obj = RCLASS_EXT_WRITABLE(obj)->fields_obj;
+    return rb_imemo_class_fields_complex_tbl(fields_obj);
 }
 
 static inline void
@@ -568,8 +571,8 @@ RCLASS_SET_FIELDS_HASH(VALUE obj, st_table *tbl)
     RUBY_ASSERT(RB_TYPE_P(obj, RUBY_T_CLASS) || RB_TYPE_P(obj, RUBY_T_MODULE));
     RUBY_ASSERT(rb_shape_obj_too_complex_p(obj));
 
-    VALUE fields = rb_imemo_class_fields_new(obj, sizeof(tbl));
-    IMEMO_OBJ_FIELDS(fields)->as.complex.table = tbl;
+    VALUE fields = rb_imemo_class_fields_new_complex(obj, tbl);
+    rb_shape_set_shape_id(fields, RBASIC_SHAPE_ID(obj));
     RCLASSEXT_SET_FIELDS_OBJ(obj, RCLASS_EXT_PRIME(obj), fields);
 }
 

internal/imemo.h

@@ -289,6 +289,7 @@ rb_imemo_class_fields_ptr(VALUE obj_fields)
     }
 
     RUBY_ASSERT(IMEMO_TYPE_P(obj_fields, imemo_class_fields));
+    RUBY_ASSERT(!FL_TEST_RAW(obj_fields, OBJ_FIELD_COMPLEX));
 
     if (RB_UNLIKELY(FL_TEST_RAW(obj_fields, OBJ_FIELD_EXTERNAL))) {
         return IMEMO_OBJ_FIELDS(obj_fields)->as.external.ptr;
@@ -298,4 +299,17 @@ rb_imemo_class_fields_ptr(VALUE obj_fields)
     }
 }
 
+static inline st_table *
+rb_imemo_class_fields_complex_tbl(VALUE obj_fields)
+{
+    if (!obj_fields) {
+        return NULL;
+    }
+
+    RUBY_ASSERT(IMEMO_TYPE_P(obj_fields, imemo_class_fields));
+    RUBY_ASSERT(FL_TEST_RAW(obj_fields, OBJ_FIELD_COMPLEX));
+
+    return IMEMO_OBJ_FIELDS(obj_fields)->as.complex.table;
+}
+
 #endif /* INTERNAL_IMEMO_H */

variable.c

@@ -1417,7 +1417,7 @@ rb_ivar_lookup(VALUE obj, ID id, VALUE undef)
             bool found = false;
             VALUE val = undef;
 
-            VALUE fields_obj = RCLASS_PRIME_FIELDS_VALUE(obj); // TODO: figure namespaces
+            VALUE fields_obj = RCLASS_PRIME_FIELDS_OBJ(obj); // TODO: figure namespaces
             if (fields_obj) {
 #if !SHAPE_IN_BASIC_FLAGS
                 shape_id = get_shape_id_from_flags(fields_obj);
@@ -2043,6 +2043,18 @@ rb_shape_set_shape_id(VALUE obj, shape_id_t shape_id)
 
 #if SHAPE_IN_BASIC_FLAGS
     RBASIC_SET_SHAPE_ID(obj, shape_id);
+    switch (BUILTIN_TYPE(obj)) {
+      case T_CLASS:
+      case T_MODULE: {
+        VALUE fields_obj = RCLASS_PRIME_FIELDS_OBJ(obj);
+        if (fields_obj) {
+            RBASIC_SET_SHAPE_ID(fields_obj, shape_id);
+        }
+        break;
+      }
+      default:
+        break;
+    }
 #else
     switch (BUILTIN_TYPE(obj)) {
       case T_OBJECT:
@@ -4769,7 +4781,7 @@ class_atomic_ivar_set(VALUE obj, ID id, VALUE val)
 {
     bool existing = true;
 
-    VALUE original_fields_obj = RCLASS_PRIME_FIELDS_VALUE(obj); // TODO: figure out namespaces
+    VALUE original_fields_obj = RCLASS_PRIME_FIELDS_OBJ(obj); // TODO: figure out namespaces
     VALUE fields_obj = original_fields_obj;
 
     if (!fields_obj) {
@@ -4815,7 +4827,7 @@ class_atomic_ivar_set(VALUE obj, ID id, VALUE val)
     }
 
     if (fields_obj != original_fields_obj) {
-        RUBY_ATOMIC_VALUE_SET(RCLASS_PRIME_FIELDS_VALUE(obj), fields_obj);
+        RUBY_ATOMIC_VALUE_SET(RCLASS_PRIME_FIELDS_OBJ(obj), fields_obj);
     }
 
     return existing;
@@ -4874,7 +4886,7 @@ rb_fields_tbl_copy(VALUE dst, VALUE src)
     RUBY_ASSERT(RB_TYPE_P(dst, T_CLASS) || RB_TYPE_P(dst, T_MODULE));
 
     RUBY_ASSERT(rb_obj_shape(dst)->type == SHAPE_ROOT);
-    RUBY_ASSERT(!RCLASS_PRIME_FIELDS_VALUE(dst));
+    RUBY_ASSERT(!RCLASS_PRIME_FIELDS_OBJ(dst));
 
     rb_ivar_foreach(src, tbl_copy_i, dst);
 }