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

delete negative cache from the table correctly

Browse Source 
negative cache entry should be removed from
vm->negative_cme_table even if the redefined class has no
subclasses.
This commit is contained in:
Koichi Sasada 2021-01-13 17:33:53 +09:00
parent c8b47eb7c9
commit f4ce78d5c1
Notes: git 2021-01-14 09:07:06 +09:00 
Merged: https://github.com/ruby/ruby/pull/4063
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vm_method.c
View File

@ -114,7 +114,7 @@ rb_vm_mtbl_dump(const char *msg, VALUE klass, ID target_mid)
} }
static inline void static inline void
vm_me_invalidate_cache(rb_callable_method_entry_t *cme) vm_cme_invalidate(rb_callable_method_entry_t *cme)
{ {
VM_ASSERT(IMEMO_TYPE_P(cme, imemo_ment)); VM_ASSERT(IMEMO_TYPE_P(cme, imemo_ment));
VM_ASSERT(callable_method_entry_p(cme)); VM_ASSERT(callable_method_entry_p(cme));
@ -128,6 +128,21 @@ rb_clear_constant_cache(void)
INC_GLOBAL_CONSTANT_STATE(); INC_GLOBAL_CONSTANT_STATE();
} }
static void
invaldate_negative_cache(ID mid, bool invalidate_cme)
{
const rb_callable_method_entry_t *cme;
rb_vm_t *vm = GET_VM();
if (rb_id_table_lookup(vm->negative_cme_table, mid, (VALUE *)&cme)) {
rb_id_table_delete(vm->negative_cme_table, mid);
if (invalidate_cme) {
vm_cme_invalidate((rb_callable_method_entry_t *)cme);
RB_DEBUG_COUNTER_INC(cc_invalidate_negative);
}
}
}
static rb_method_entry_t *rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, const rb_method_definition_t *def); static rb_method_entry_t *rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, const rb_method_definition_t *def);
const rb_method_entry_t * rb_method_entry_clone(const rb_method_entry_t *src_me); const rb_method_entry_t * rb_method_entry_clone(const rb_method_entry_t *src_me);
static const rb_callable_method_entry_t *complemented_callable_method_entry(VALUE klass, ID id); static const rb_callable_method_entry_t *complemented_callable_method_entry(VALUE klass, ID id);
@ -146,6 +161,7 @@ clear_method_cache_by_id_in_class(VALUE klass, ID mid)
// invalidate CCs // invalidate CCs
if (cc_tbl && rb_id_table_lookup(cc_tbl, mid, (VALUE *)&ccs)) { if (cc_tbl && rb_id_table_lookup(cc_tbl, mid, (VALUE *)&ccs)) {
if (NIL_P(ccs->cme->owner)) invaldate_negative_cache(mid, false);
rb_vm_ccs_free(ccs); rb_vm_ccs_free(ccs);
rb_id_table_delete(cc_tbl, mid); rb_id_table_delete(cc_tbl, mid);
RB_DEBUG_COUNTER_INC(cc_invalidate_leaf_ccs); RB_DEBUG_COUNTER_INC(cc_invalidate_leaf_ccs);
@ -177,7 +193,7 @@ clear_method_cache_by_id_in_class(VALUE klass, ID mid)
rb_method_table_insert(origin, RCLASS_M_TBL(origin), mid, new_cme); rb_method_table_insert(origin, RCLASS_M_TBL(origin), mid, new_cme);
} }
vm_me_invalidate_cache((rb_callable_method_entry_t *)cme); vm_cme_invalidate((rb_callable_method_entry_t *)cme);
RB_DEBUG_COUNTER_INC(cc_invalidate_tree_cme); RB_DEBUG_COUNTER_INC(cc_invalidate_tree_cme);
} }
@ -194,13 +210,7 @@ clear_method_cache_by_id_in_class(VALUE klass, ID mid)
RB_DEBUG_COUNTER_INC(cc_invalidate_tree); RB_DEBUG_COUNTER_INC(cc_invalidate_tree);
} }
else { else {
rb_vm_t *vm = GET_VM(); invaldate_negative_cache(mid, true);
if (rb_id_table_lookup(vm->negative_cme_table, mid, (VALUE *)&cme)) {
rb_id_table_delete(vm->negative_cme_table, mid);
vm_me_invalidate_cache((rb_callable_method_entry_t *)cme);
RB_DEBUG_COUNTER_INC(cc_invalidate_negative);
}
} }
} }
} }