1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor class variable cache functions

Browse Source 
Extracted repeated code as update_classvariable_cache.  When cvc
table is not set in getclassvariable, an empty table was created
but it has no id and would cause [BUG], so made the code same as
setclassvariable.
This commit is contained in:
Nobuyoshi Nakada 2021-06-23 09:39:04 +09:00
parent 46ff44ef17
commit 0700ee0e94
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
2 changed files with 36 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
variable.c
View File

@ -3407,14 +3407,17 @@ rb_cvar_set(VALUE klass, ID id, VALUE val)
} }
struct rb_cvar_class_tbl_entry *ent; struct rb_cvar_class_tbl_entry *ent;
VALUE ent_data;
if (!rb_id_table_lookup(rb_cvc_tbl, id, (VALUE*)&ent)) { if (!rb_id_table_lookup(rb_cvc_tbl, id, &ent_data)) {
ent = ALLOC(struct rb_cvar_class_tbl_entry); ent = ALLOC(struct rb_cvar_class_tbl_entry);
ent->class_value = target; ent->class_value = target;
ent->global_cvar_state = GET_GLOBAL_CVAR_STATE(); ent->global_cvar_state = GET_GLOBAL_CVAR_STATE();
rb_id_table_insert(rb_cvc_tbl, id, (VALUE)ent); rb_id_table_insert(rb_cvc_tbl, id, (VALUE)ent);
RB_DEBUG_COUNTER_INC(cvar_inline_miss); RB_DEBUG_COUNTER_INC(cvar_inline_miss);
} else { }
else {
ent = (void *)ent_data;
ent->global_cvar_state = GET_GLOBAL_CVAR_STATE(); ent->global_cvar_state = GET_GLOBAL_CVAR_STATE();
} }

79
vm_insnhelper.c
View File

@ -1281,6 +1281,35 @@ vm_setivar(VALUE obj, ID id, VALUE val, const rb_iseq_t *iseq, IVC ic, const str
} }
} }
static VALUE
update_classvariable_cache(const rb_iseq_t *iseq, VALUE klass, ID id, ICVARC ic)
{
VALUE defined_class = 0;
VALUE cvar_value = rb_cvar_find(klass, id, &defined_class);
if (RB_TYPE_P(defined_class, T_ICLASS)) {
defined_class = RBASIC(defined_class)->klass;
}
struct rb_id_table *rb_cvc_tbl = RCLASS_CVC_TBL(defined_class);
if (!rb_cvc_tbl) {
rb_bug("the cvc table should be set");
}
VALUE ent_data;
if (!rb_id_table_lookup(rb_cvc_tbl, id, &ent_data)) {
rb_bug("should have cvar cache entry");
}
struct rb_cvar_class_tbl_entry *ent = (void *)ent_data;
ent->global_cvar_state = GET_GLOBAL_CVAR_STATE();
ic->entry = ent;
RB_OBJ_WRITTEN(iseq, Qundef, ent->class_value);
return cvar_value;
}
static inline VALUE static inline VALUE
vm_getclassvariable(const rb_iseq_t *iseq, const rb_cref_t *cref, const rb_control_frame_t *cfp, ID id, ICVARC ic) vm_getclassvariable(const rb_iseq_t *iseq, const rb_cref_t *cref, const rb_control_frame_t *cfp, ID id, ICVARC ic)
{ {
@ -1294,32 +1323,8 @@ vm_getclassvariable(const rb_iseq_t *iseq, const rb_cref_t *cref, const rb_contr
} }
VALUE klass = vm_get_cvar_base(cref, cfp, 1); VALUE klass = vm_get_cvar_base(cref, cfp, 1);
VALUE defined_class = 0;
VALUE cvar_value = rb_cvar_find(klass, id, &defined_class); return update_classvariable_cache(iseq, klass, id, ic);
if (RB_TYPE_P(defined_class, T_ICLASS)) {
defined_class = RBASIC(defined_class)->klass;
}
struct rb_id_table *rb_cvc_tbl = RCLASS_CVC_TBL(defined_class);
if (!rb_cvc_tbl) {
rb_cvc_tbl = RCLASS_CVC_TBL(defined_class) = rb_id_table_create(2);
}
struct rb_cvar_class_tbl_entry *ent;
if (!rb_id_table_lookup(rb_cvc_tbl, id, (VALUE*)&ent)) {
rb_bug("should have cvar cache entry");
} else {
ent->global_cvar_state = GET_GLOBAL_CVAR_STATE();
}
ic->entry = ent;
RB_OBJ_WRITTEN(iseq, Qundef, ent->class_value);
return cvar_value;
} }
static inline void static inline void
@ -1336,29 +1341,7 @@ vm_setclassvariable(const rb_iseq_t *iseq, const rb_cref_t *cref, const rb_contr
rb_cvar_set(klass, id, val); rb_cvar_set(klass, id, val);
VALUE defined_class = 0; update_classvariable_cache(iseq, klass, id, ic);
rb_cvar_find(klass, id, &defined_class);
if (RB_TYPE_P(defined_class, T_ICLASS)) {
defined_class = RBASIC(defined_class)->klass;
}
struct rb_id_table *rb_cvc_tbl = RCLASS_CVC_TBL(defined_class);
if (!rb_cvc_tbl) {
rb_bug("the cvc table should be set");
}
struct rb_cvar_class_tbl_entry *ent;
if (!rb_id_table_lookup(rb_cvc_tbl, id, (VALUE*)&ent)) {
rb_bug("should have cvar cache entry");
} else {
ent->global_cvar_state = GET_GLOBAL_CVAR_STATE();
}
ic->entry = ent;
RB_OBJ_WRITTEN(iseq, Qundef, ent->class_value);
} }
static inline VALUE static inline VALUE