kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

refactor delete rb_method_definition_set

Browse source 
Instead of destructively write fields of method entries, create a
new entry and let it overwrite its owner.
This commit is contained in:
卜部昌平 2019-09-24 15:41:52 +09:00
parent 595b3c4fdd
commit 3207979278
Notes: git 2019-09-30 10:27:05 +09:00 
Merged: https://github.com/ruby/ruby/pull/2486
2 changed files with 46 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
vm_insnhelper.c
View file

@ -20,7 +20,7 @@
#include "debug_counter.h" #include "debug_counter.h"
extern const rb_method_definition_t *rb_method_definition_create(rb_method_type_t type, ID mid, const void *opts); extern const rb_method_definition_t *rb_method_definition_create(rb_method_type_t type, ID mid, const void *opts);
extern void rb_method_definition_set(const rb_method_entry_t *me, const rb_method_definition_t *def); extern void rb_method_entry_spoof(const rb_method_entry_t *me);
extern int rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2); extern int rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2);
extern VALUE rb_make_no_method_exception(VALUE exc, VALUE format, VALUE obj, extern VALUE rb_make_no_method_exception(VALUE exc, VALUE format, VALUE obj,
int argc, const VALUE *argv, int priv); int argc, const VALUE *argv, int priv);
@ -2574,32 +2574,39 @@ find_defined_class_by_owner(VALUE current_class, VALUE target_owner)
return current_class; /* maybe module function */ return current_class; /* maybe module function */
} }
static const rb_callable_method_entry_t * static const void*
aliased_callable_method_entry(const rb_callable_method_entry_t *me) aliased_callable_method_entry0(const rb_method_entry_t *me)
{ {
const rb_method_entry_t *orig_me = me->def->body.alias.original_me; const rb_method_entry_t *orig_me = me->def->body.alias.original_me;
const rb_callable_method_entry_t *cme; const rb_callable_method_entry_t *cme;
if (orig_me->defined_class == 0) { if (orig_me->defined_class != 0) {
VM_ASSERT(callable_method_entry_p(orig_me));
return orig_me;
}
else {
VALUE defined_class = find_defined_class_by_owner(me->defined_class, orig_me->owner); VALUE defined_class = find_defined_class_by_owner(me->defined_class, orig_me->owner);
VM_ASSERT(RB_TYPE_P(orig_me->owner, T_MODULE)); VM_ASSERT(RB_TYPE_P(orig_me->owner, T_MODULE));
cme = rb_method_entry_complement_defined_class(orig_me, me->called_id, defined_class); cme = rb_method_entry_complement_defined_class(orig_me, me->called_id, defined_class);
rb_method_entry_t *ret =
if (me->def->alias_count + me->def->complemented_count == 0) { rb_method_entry_create(
RB_OBJ_WRITE(me, &me->def->body.alias.original_me, cme); me->called_id,
} me->owner,
else { me->defined_class,
const rb_method_definition_t *def = rb_method_definition_create(
rb_method_definition_create(VM_METHOD_TYPE_ALIAS, me->def->original_id, cme); VM_METHOD_TYPE_ALIAS,
rb_method_definition_set((rb_method_entry_t *)me, def); me->def->original_id,
} cme));
} METHOD_ENTRY_FLAGS_COPY(ret, (const void*)me);
else { rb_method_entry_spoof(ret);
cme = (const rb_callable_method_entry_t *)orig_me; return ret;
} }
}
VM_ASSERT(callable_method_entry_p(cme)); static const rb_callable_method_entry_t*
return cme; aliased_callable_method_entry(const rb_callable_method_entry_t *me)
{
return aliased_callable_method_entry0((const void*)me);
} }
static const rb_callable_method_entry_t * static const rb_callable_method_entry_t *

31
vm_method.c
View file

@ -443,10 +443,13 @@ rb_method_definition_new(rb_method_type_t type, ID mid, const void *opts)
} }
MJIT_FUNC_EXPORTED void MJIT_FUNC_EXPORTED void
rb_method_definition_set(const rb_method_entry_t *me, const rb_method_definition_t *def) rb_method_entry_spoof(const rb_method_entry_t *me)
{ {
memcpy((void *)&me->def, &def, sizeof def); VALUE v = (VALUE)me;
method_definition_reset(me); VALUE o = me->owner;
rb_id_table_insert(RCLASS_M_TBL(o), me->called_id, v);
RB_OBJ_WRITTEN(o, Qundef, v);
rb_clear_method_cache_by_class(o);
} }
MJIT_FUNC_EXPORTED const rb_method_definition_t * MJIT_FUNC_EXPORTED const rb_method_definition_t *
@ -495,7 +498,7 @@ filter_defined_class(VALUE klass)
rb_bug("filter_defined_class: %s", rb_obj_info(klass)); rb_bug("filter_defined_class: %s", rb_obj_info(klass));
} }
rb_method_entry_t * MJIT_FUNC_EXPORTED rb_method_entry_t *
rb_method_entry_create(ID called_id, VALUE klass, rb_method_visibility_t visi, const rb_method_definition_t *def) rb_method_entry_create(ID called_id, VALUE klass, rb_method_visibility_t visi, const rb_method_definition_t *def)
{ {
rb_method_entry_t *me = rb_method_entry_alloc(called_id, klass, filter_defined_class(klass), def); rb_method_entry_t *me = rb_method_entry_alloc(called_id, klass, filter_defined_class(klass), def);
@ -554,11 +557,11 @@ rb_method_entry_copy(rb_method_entry_t *dst, const rb_method_entry_t *src)
METHOD_ENTRY_FLAGS_COPY(dst, src); METHOD_ENTRY_FLAGS_COPY(dst, src);
} }
static void static rb_method_entry_t*
make_method_entry_refined(VALUE owner, rb_method_entry_t *me) make_method_entry_refined(VALUE owner, rb_method_entry_t *me)
{ {
if (me->def->type == VM_METHOD_TYPE_REFINED) { if (me->def->type == VM_METHOD_TYPE_REFINED) {
return; return me;
} }
else { else {
rb_vm_check_redefinition_opt_method(me, me->owner); rb_vm_check_redefinition_opt_method(me, me->owner);
@ -577,8 +580,15 @@ make_method_entry_refined(VALUE owner, rb_method_entry_t *me)
.owner = owner, .owner = owner,
} }
); );
rb_method_definition_set(me, def); rb_method_entry_t *new_me =
METHOD_ENTRY_VISI_SET(me, METHOD_VISI_PUBLIC); rb_method_entry_create(
me->called_id,
me->owner,
me->defined_class,
def);
METHOD_ENTRY_FLAGS_COPY(new_me, me);
METHOD_ENTRY_VISI_SET(new_me, METHOD_VISI_PUBLIC);
return new_me;
} }
} }
@ -588,7 +598,8 @@ rb_add_refined_method_entry(VALUE refined_class, ID mid)
rb_method_entry_t *me = lookup_method_table(refined_class, mid); rb_method_entry_t *me = lookup_method_table(refined_class, mid);
if (me) { if (me) {
make_method_entry_refined(refined_class, me); me = make_method_entry_refined(refined_class, me);
rb_method_entry_spoof(me);
rb_clear_method_cache_by_class(refined_class); rb_clear_method_cache_by_class(refined_class);
} }
else { else {
@ -723,7 +734,7 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil
} }
if (make_refined) { if (make_refined) {
make_method_entry_refined(klass, me); me = make_method_entry_refined(klass, me);
} }
rb_id_table_insert(mtbl, mid, (VALUE)me); rb_id_table_insert(mtbl, mid, (VALUE)me);