Object shapes work in progress

Author: jemmaissroff

compile.c

@@ -2058,20 +2058,7 @@ cdhash_set_label_i(VALUE key, VALUE val, VALUE ptr)
 static inline VALUE
 get_ivar_ic_value(rb_iseq_t *iseq,ID id)
 {
- VALUE val;
- struct rb_id_table *tbl = ISEQ_COMPILE_DATA(iseq)->ivar_cache_table;
- if (tbl) {
-if (rb_id_table_lookup(tbl,id,&val)) {
- return val;
-}
- }
- else {
-tbl = rb_id_table_create(1);
-ISEQ_COMPILE_DATA(iseq)->ivar_cache_table = tbl;
- }
- val = INT2FIX(ISEQ_BODY(iseq)->is_size++);
- rb_id_table_insert(tbl,id,val);
- return val;
+ return INT2FIX(iseq->body->is_size++);
 }
 
 #define BADINSN_DUMP(anchor, list, dest) \
@@ -2396,10 +2383,14 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
  }
  break;
 }
+ case TS_IVC: /* inline ivar cache */
+ {
+ unsigned int ic_index = FIX2UINT(operands[j]);
+ vm_ic_attr_index_initialize(((IVC)&body->is_entries[ic_index]), INVALID_SHAPE_ID);
+ }
  case TS_IC: /* inline cache */
  case TS_ISE: /* inline storage entry */
  case TS_ICVARC: /* inline cvar cache */
- case TS_IVC: /* inline ivar cache */
 {
  unsigned int ic_index = FIX2UINT(operands[j]);
  IC ic = (IC)&body->is_entries[ic_index];
@@ -11222,6 +11213,9 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod
  VALUE op = ibf_load_small_value(load, &reading_pos);
  code[code_index] = (VALUE)&is_entries[op];
 
+ if (operand_type == TS_IVC)
+ vm_ic_attr_index_initialize(((IVC)code[code_index]), INVALID_SHAPE_ID);
+
  if (insn == BIN(opt_getinlinecache) && operand_type == TS_IC) {
  // Store the instruction index for opt_getinlinecache on the IC for
  // YJIT to invalidate code when opt_setinlinecache runs.

debug_counter.h

@@ -141,16 +141,19 @@ RB_DEBUG_COUNTER(frame_C2R)
 RB_DEBUG_COUNTER(ivar_get_ic_hit)
 RB_DEBUG_COUNTER(ivar_get_ic_miss)
 RB_DEBUG_COUNTER(ivar_get_ic_miss_serial)
-RB_DEBUG_COUNTER(ivar_get_ic_miss_unset)
 RB_DEBUG_COUNTER(ivar_get_ic_miss_noobject)
 RB_DEBUG_COUNTER(ivar_set_ic_hit)
-RB_DEBUG_COUNTER(ivar_set_ic_miss)
+RB_DEBUG_COUNTER(ivar_set_ic_hit_not_attr)
 RB_DEBUG_COUNTER(ivar_set_ic_miss_serial)
-RB_DEBUG_COUNTER(ivar_set_ic_miss_unset)
+RB_DEBUG_COUNTER(ivar_set_cc_miss_set)
 RB_DEBUG_COUNTER(ivar_set_ic_miss_iv_hit)
 RB_DEBUG_COUNTER(ivar_set_ic_miss_noobject)
 RB_DEBUG_COUNTER(ivar_get_base)
 RB_DEBUG_COUNTER(ivar_set_base)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_set)
+RB_DEBUG_COUNTER(ivar_get_cc_miss_set)
+RB_DEBUG_COUNTER(ivar_get_ic_miss_unset)
+RB_DEBUG_COUNTER(ivar_get_cc_miss_unset)
 
 /* local variable counts
  *

ext/objspace/objspace.c

@@ -644,6 +644,7 @@ count_imemo_objects(int argc, VALUE *argv, VALUE self)
  INIT_IMEMO_TYPE_ID(imemo_callinfo);
  INIT_IMEMO_TYPE_ID(imemo_callcache);
  INIT_IMEMO_TYPE_ID(imemo_constcache);
+ INIT_IMEMO_TYPE_ID(imemo_shape);
 #undef INIT_IMEMO_TYPE_ID
  }