diff options
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 1463 |
1 files changed, 906 insertions, 557 deletions
diff --git a/vm_method.c b/vm_method.c index 1fd0bd57f7..b58049bf7d 100644 --- a/vm_method.c +++ b/vm_method.c @@ -3,6 +3,8 @@ */ #include "id_table.h" +#include "yjit.h" +#include "rjit.h" #define METHOD_DEBUG 0 @@ -17,7 +19,6 @@ static inline rb_method_entry_t *lookup_method_table(VALUE klass, ID id); #define singleton_removed idSingleton_method_removed #define undefined idMethod_undefined #define singleton_undefined idSingleton_method_undefined -#define attached id__attached__ #define ruby_running (GET_VM()->running) /* int ruby_running = 0; */ @@ -30,7 +31,6 @@ vm_ccs_dump_i(ID mid, VALUE val, void *data) rp(ccs->cme); for (int i=0; i<ccs->len; i++) { - fprintf(stderr, " | [%d]\t", i); vm_ci_dump(ccs->entries[i].ci); rp_m( " | \t", ccs->entries[i].cc); } @@ -117,16 +117,39 @@ rb_vm_mtbl_dump(const char *msg, VALUE klass, ID target_mid) static inline void 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), "cme: %d", imemo_type((VALUE)cme)); VM_ASSERT(callable_method_entry_p(cme)); METHOD_ENTRY_INVALIDATED_SET(cme); RB_DEBUG_COUNTER_INC(cc_cme_invalidate); + + rb_yjit_cme_invalidate(cme); + rb_rjit_cme_invalidate(cme); +} + +static int +rb_clear_constant_cache_for_id_i(st_data_t ic, st_data_t idx, st_data_t arg) +{ + ((IC) ic)->entry = NULL; + return ST_CONTINUE; } +// Here for backward compat. +void rb_clear_constant_cache(void) {} + void -rb_clear_constant_cache(void) +rb_clear_constant_cache_for_id(ID id) { - INC_GLOBAL_CONSTANT_STATE(); + VALUE lookup_result; + rb_vm_t *vm = GET_VM(); + + if (rb_id_table_lookup(vm->constant_cache, id, &lookup_result)) { + st_table *ics = (st_table *)lookup_result; + st_foreach(ics, rb_clear_constant_cache_for_id_i, (st_data_t) NULL); + ruby_vm_constant_cache_invalidations += ics->num_entries; + } + + rb_yjit_constant_state_changed(id); + rb_rjit_constant_state_changed(id); } static void @@ -142,9 +165,10 @@ invalidate_negative_cache(ID mid) } } -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); static const rb_callable_method_entry_t *complemented_callable_method_entry(VALUE klass, ID id); +static const rb_callable_method_entry_t *lookup_overloaded_cme(const rb_callable_method_entry_t *cme); + static void clear_method_cache_by_id_in_class(VALUE klass, ID mid) @@ -152,6 +176,7 @@ clear_method_cache_by_id_in_class(VALUE klass, ID mid) VM_ASSERT(RB_TYPE_P(klass, T_CLASS) || RB_TYPE_P(klass, T_ICLASS)); if (rb_objspace_garbage_object_p(klass)) return; + RB_VM_LOCK_ENTER(); if (LIKELY(RCLASS_SUBCLASSES(klass) == NULL)) { // no subclasses // check only current class @@ -162,6 +187,8 @@ clear_method_cache_by_id_in_class(VALUE klass, ID mid) // invalidate CCs if (cc_tbl && rb_id_table_lookup(cc_tbl, mid, &ccs_data)) { struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_data; + rb_yjit_cme_invalidate((rb_callable_method_entry_t *)ccs->cme); + rb_rjit_cme_invalidate((rb_callable_method_entry_t *)ccs->cme); if (NIL_P(ccs->cme->owner)) invalidate_negative_cache(mid); rb_vm_ccs_free(ccs); rb_id_table_delete(cc_tbl, mid); @@ -171,6 +198,13 @@ clear_method_cache_by_id_in_class(VALUE klass, ID mid) // remove from callable_m_tbl, if exists struct rb_id_table *cm_tbl; if ((cm_tbl = RCLASS_CALLABLE_M_TBL(klass)) != NULL) { + VALUE cme; + if (rb_yjit_enabled_p && rb_id_table_lookup(cm_tbl, mid, &cme)) { + rb_yjit_cme_invalidate((rb_callable_method_entry_t *)cme); + } + if (rb_rjit_enabled && rb_id_table_lookup(cm_tbl, mid, &cme)) { + rb_rjit_cme_invalidate((rb_callable_method_entry_t *)cme); + } rb_id_table_delete(cm_tbl, mid); RB_DEBUG_COUNTER_INC(cc_invalidate_leaf_callable); } @@ -204,6 +238,20 @@ clear_method_cache_by_id_in_class(VALUE klass, ID mid) vm_cme_invalidate((rb_callable_method_entry_t *)cme); RB_DEBUG_COUNTER_INC(cc_invalidate_tree_cme); + + // In case of refinement ME, also invalidate the wrapped ME that + // could be cached at some callsite and is unreachable from any + // RCLASS_CC_TBL. + if (cme->def->type == VM_METHOD_TYPE_REFINED && cme->def->body.refined.orig_me) { + vm_cme_invalidate((rb_callable_method_entry_t *)cme->def->body.refined.orig_me); + } + + if (cme->def->iseq_overload) { + rb_callable_method_entry_t *monly_cme = (rb_callable_method_entry_t *)lookup_overloaded_cme(cme); + if (monly_cme) { + vm_cme_invalidate(monly_cme); + } + } } // invalidate complement tbl @@ -222,6 +270,7 @@ clear_method_cache_by_id_in_class(VALUE klass, ID mid) invalidate_negative_cache(mid); } } + RB_VM_LOCK_LEAVE(); } static void @@ -251,6 +300,7 @@ rb_clear_method_cache(VALUE klass_or_module, ID mid) VALUE refined_class = rb_refinement_module_get_refined_class(module); rb_clear_method_cache(refined_class, mid); rb_class_foreach_subclass(refined_class, clear_iclass_method_cache_by_id_for_refinements, mid); + rb_clear_all_refinement_method_cache(); } rb_class_foreach_subclass(module, clear_iclass_method_cache_by_id, mid); } @@ -259,25 +309,23 @@ rb_clear_method_cache(VALUE klass_or_module, ID mid) } } -// gc.c -void rb_cc_table_free(VALUE klass); - static int -invalidate_all_cc(void *vstart, void *vend, size_t stride, void *data) +invalidate_all_refinement_cc(void *vstart, void *vend, size_t stride, void *data) { VALUE v = (VALUE)vstart; for (; v != (VALUE)vend; v += stride) { void *ptr = asan_poisoned_object_p(v); asan_unpoison_object(v, false); + if (RBASIC(v)->flags) { // liveness check - if (RB_TYPE_P(v, T_CLASS) || - RB_TYPE_P(v, T_ICLASS)) { - if (RCLASS_CC_TBL(v)) { - rb_cc_table_free(v); + if (imemo_type_p(v, imemo_callcache)) { + const struct rb_callcache *cc = (const struct rb_callcache *)v; + if (vm_cc_refinement_p(cc) && cc->klass) { + vm_cc_invalidate(cc); } - RCLASS_CC_TBL(v) = NULL; } } + if (ptr) { asan_poison_object(v); } @@ -285,10 +333,123 @@ invalidate_all_cc(void *vstart, void *vend, size_t stride, void *data) return 0; // continue to iteration } +static st_index_t +vm_ci_hash(VALUE v) +{ + const struct rb_callinfo *ci = (const struct rb_callinfo *)v; + st_index_t h; + h = rb_hash_start(ci->mid); + h = rb_hash_uint(h, ci->flag); + h = rb_hash_uint(h, ci->argc); + if (ci->kwarg) { + for (int i = 0; i < ci->kwarg->keyword_len; i++) { + h = rb_hash_uint(h, ci->kwarg->keywords[i]); + } + } + return h; +} + +static int +vm_ci_hash_cmp(VALUE v1, VALUE v2) +{ + const struct rb_callinfo *ci1 = (const struct rb_callinfo *)v1; + const struct rb_callinfo *ci2 = (const struct rb_callinfo *)v2; + if (ci1->mid != ci2->mid) return 1; + if (ci1->flag != ci2->flag) return 1; + if (ci1->argc != ci2->argc) return 1; + if (ci1->kwarg != NULL) { + VM_ASSERT(ci2->kwarg != NULL); // implied by matching flags + + if (ci1->kwarg->keyword_len != ci2->kwarg->keyword_len) + return 1; + + for (int i = 0; i < ci1->kwarg->keyword_len; i++) { + if (ci1->kwarg->keywords[i] != ci2->kwarg->keywords[i]) { + return 1; + } + } + } else { + VM_ASSERT(ci2->kwarg == NULL); // implied by matching flags + } + return 0; +} + +static const struct st_hash_type vm_ci_hashtype = { + vm_ci_hash_cmp, + vm_ci_hash +}; + +static int +ci_lookup_i(st_data_t *key, st_data_t *value, st_data_t data, int existing) +{ + const struct rb_callinfo *ci = (const struct rb_callinfo *)*key; + st_data_t *ret = (st_data_t *)data; + + if (existing) { + if (rb_objspace_garbage_object_p((VALUE)ci)) { + *ret = (st_data_t)NULL; + return ST_DELETE; + } else { + *ret = *key; + return ST_STOP; + } + } + else { + *key = *value = *ret = (st_data_t)ci; + return ST_CONTINUE; + } +} + +const struct rb_callinfo * +rb_vm_ci_lookup(ID mid, unsigned int flag, unsigned int argc, const struct rb_callinfo_kwarg *kwarg) +{ + rb_vm_t *vm = GET_VM(); + const struct rb_callinfo *ci = NULL; + + if (kwarg) { + ((struct rb_callinfo_kwarg *)kwarg)->references++; + } + + struct rb_callinfo *new_ci = IMEMO_NEW(struct rb_callinfo, imemo_callinfo, (VALUE)kwarg); + new_ci->mid = mid; + new_ci->flag = flag; + new_ci->argc = argc; + + RB_VM_LOCK_ENTER(); + { + st_table *ci_table = vm->ci_table; + VM_ASSERT(ci_table); + + do { + st_update(ci_table, (st_data_t)new_ci, ci_lookup_i, (st_data_t)&ci); + } while (ci == NULL); + } + RB_VM_LOCK_LEAVE(); + + VM_ASSERT(ci); + VM_ASSERT(vm_ci_markable(ci)); + + return ci; +} + +void +rb_vm_ci_free(const struct rb_callinfo *ci) +{ + rb_vm_t *vm = GET_VM(); + + RB_VM_LOCK_ENTER(); + { + st_data_t key = (st_data_t)ci; + st_delete(vm->ci_table, &key, NULL); + } + RB_VM_LOCK_LEAVE(); +} + void -rb_clear_method_cache_all(void) +rb_clear_all_refinement_method_cache(void) { - rb_objspace_each_objects(invalidate_all_cc, NULL); + rb_objspace_each_objects(invalidate_all_refinement_cc, NULL); + rb_yjit_invalidate_all_method_lookup_assumptions(); } void @@ -304,14 +465,27 @@ rb_method_table_insert(VALUE klass, struct rb_id_table *table, ID method_id, con RB_OBJ_WRITTEN(table_owner, Qundef, (VALUE)me); } -VALUE -rb_f_notimplement(int argc, const VALUE *argv, VALUE obj, VALUE marker) +// rb_f_notimplement has an extra trailing argument to distinguish it from other methods +// at compile-time to override arity to be -1. But the trailing argument introduces a +// signature mismatch between caller and callee, so rb_define_method family inserts a +// method entry with rb_f_notimplement_internal, which has canonical arity=-1 signature, +// instead of rb_f_notimplement. +NORETURN(static VALUE rb_f_notimplement_internal(int argc, const VALUE *argv, VALUE obj)); + +static VALUE +rb_f_notimplement_internal(int argc, const VALUE *argv, VALUE obj) { rb_notimplement(); UNREACHABLE_RETURN(Qnil); } +VALUE +rb_f_notimplement(int argc, const VALUE *argv, VALUE obj, VALUE marker) +{ + rb_f_notimplement_internal(argc, argv, obj); +} + static void rb_define_notimplement_method_id(VALUE mod, ID id, rb_method_visibility_t visi) { @@ -322,51 +496,60 @@ void rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_visibility_t visi) { if (argc < -2 || 15 < argc) rb_raise(rb_eArgError, "arity out of range: %d for -2..15", argc); - if (func != rb_f_notimplement) { - rb_method_cfunc_t opt; - opt.func = func; - opt.argc = argc; + if (func != (VALUE(*)(ANYARGS))rb_f_notimplement) { + rb_method_cfunc_t opt; + opt.func = func; + opt.argc = argc; rb_add_method(klass, mid, VM_METHOD_TYPE_CFUNC, &opt, visi); } else { - rb_define_notimplement_method_id(klass, mid, visi); + rb_define_notimplement_method_id(klass, mid, visi); } } +void +rb_add_method_optimized(VALUE klass, ID mid, enum method_optimized_type opt_type, unsigned int index, rb_method_visibility_t visi) +{ + rb_method_optimized_t opt = { + .type = opt_type, + .index = index, + }; + rb_add_method(klass, mid, VM_METHOD_TYPE_OPTIMIZED, &opt, visi); +} + static void -rb_method_definition_release(rb_method_definition_t *def, int complemented) +rb_method_definition_release(rb_method_definition_t *def) { if (def != NULL) { - const int alias_count = def->alias_count; - const int complemented_count = def->complemented_count; - VM_ASSERT(alias_count >= 0); - VM_ASSERT(complemented_count >= 0); - - if (alias_count + complemented_count == 0) { - if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d,%d (remove)\n", (void *)def, - rb_id2name(def->original_id), alias_count, complemented_count); - VM_ASSERT(def->type == VM_METHOD_TYPE_BMETHOD ? def->body.bmethod.hooks == NULL : TRUE); - xfree(def); - } - else { - if (complemented) { - VM_ASSERT(def->complemented_count > 0); - def->complemented_count--; - } - else if (def->alias_count > 0) { - def->alias_count--; - } + const int reference_count = def->reference_count; + def->reference_count--; + + VM_ASSERT(reference_count >= 0); - if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d->%d,%d->%d (dec)\n", (void *)def, rb_id2name(def->original_id), - alias_count, def->alias_count, complemented_count, def->complemented_count); - } + if (def->reference_count == 0) { + if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d (remove)\n", (void *)def, + rb_id2name(def->original_id), def->reference_count); + if (def->type == VM_METHOD_TYPE_BMETHOD && def->body.bmethod.hooks) { + xfree(def->body.bmethod.hooks); + } + xfree(def); + } + else { + if (METHOD_DEBUG) fprintf(stderr, "-%p-%s:%d->%d (dec)\n", (void *)def, rb_id2name(def->original_id), + reference_count, def->reference_count); + } } } +static void delete_overloaded_cme(const rb_callable_method_entry_t *cme); + void rb_free_method_entry(const rb_method_entry_t *me) { - rb_method_definition_release(me->def, METHOD_ENTRY_COMPLEMENTED(me)); + if (me->def && me->def->iseq_overload) { + delete_overloaded_cme((const rb_callable_method_entry_t *)me); + } + rb_method_definition_release(me->def); } static inline rb_method_entry_t *search_method(VALUE klass, ID id, VALUE *defined_class_ptr); @@ -433,84 +616,97 @@ setup_method_cfunc_struct(rb_method_cfunc_t *cfunc, VALUE (*func)(ANYARGS), int cfunc->invoker = call_cfunc_invoker_func(argc); } -MJIT_FUNC_EXPORTED void +static rb_method_definition_t * +method_definition_addref(rb_method_definition_t *def, bool complemented) +{ + if (!complemented && def->reference_count > 0) def->aliased = true; + def->reference_count++; + if (METHOD_DEBUG) fprintf(stderr, "+%p-%s:%d\n", (void *)def, rb_id2name(def->original_id), def->reference_count); + return def; +} + +void rb_method_definition_set(const rb_method_entry_t *me, rb_method_definition_t *def, void *opts) { - *(rb_method_definition_t **)&me->def = def; + rb_method_definition_release(me->def); + *(rb_method_definition_t **)&me->def = method_definition_addref(def, METHOD_ENTRY_COMPLEMENTED(me)); + + if (!ruby_running) add_opt_method_entry(me); if (opts != NULL) { - switch (def->type) { - case VM_METHOD_TYPE_ISEQ: - { - rb_method_iseq_t *iseq_body = (rb_method_iseq_t *)opts; - rb_cref_t *method_cref, *cref = iseq_body->cref; - - /* setup iseq first (before invoking GC) */ - RB_OBJ_WRITE(me, &def->body.iseq.iseqptr, iseq_body->iseqptr); - - if (0) vm_cref_dump("rb_method_definition_create", cref); - - if (cref) { - method_cref = cref; - } - else { - method_cref = vm_cref_new_toplevel(GET_EC()); /* TODO: can we reuse? */ - } - - RB_OBJ_WRITE(me, &def->body.iseq.cref, method_cref); - return; - } - case VM_METHOD_TYPE_CFUNC: - { - rb_method_cfunc_t *cfunc = (rb_method_cfunc_t *)opts; - setup_method_cfunc_struct(UNALIGNED_MEMBER_PTR(def, body.cfunc), cfunc->func, cfunc->argc); - return; - } - case VM_METHOD_TYPE_ATTRSET: - case VM_METHOD_TYPE_IVAR: - { - const rb_execution_context_t *ec = GET_EC(); - rb_control_frame_t *cfp; - int line; - - def->body.attr.id = (ID)(VALUE)opts; - - cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp); - - if (cfp && (line = rb_vm_get_sourceline(cfp))) { - VALUE location = rb_ary_new3(2, rb_iseq_path(cfp->iseq), INT2FIX(line)); - RB_OBJ_WRITE(me, &def->body.attr.location, rb_ary_freeze(location)); - } - else { - VM_ASSERT(def->body.attr.location == 0); - } - return; - } - case VM_METHOD_TYPE_BMETHOD: + switch (def->type) { + case VM_METHOD_TYPE_ISEQ: + { + rb_method_iseq_t *iseq_body = (rb_method_iseq_t *)opts; + const rb_iseq_t *iseq = iseq_body->iseqptr; + rb_cref_t *method_cref, *cref = iseq_body->cref; + + /* setup iseq first (before invoking GC) */ + RB_OBJ_WRITE(me, &def->body.iseq.iseqptr, iseq); + + if (ISEQ_BODY(iseq)->mandatory_only_iseq) def->iseq_overload = 1; + + if (0) vm_cref_dump("rb_method_definition_create", cref); + + if (cref) { + method_cref = cref; + } + else { + method_cref = vm_cref_new_toplevel(GET_EC()); /* TODO: can we reuse? */ + } + + RB_OBJ_WRITE(me, &def->body.iseq.cref, method_cref); + return; + } + case VM_METHOD_TYPE_CFUNC: + { + rb_method_cfunc_t *cfunc = (rb_method_cfunc_t *)opts; + setup_method_cfunc_struct(UNALIGNED_MEMBER_PTR(def, body.cfunc), cfunc->func, cfunc->argc); + return; + } + case VM_METHOD_TYPE_ATTRSET: + case VM_METHOD_TYPE_IVAR: + { + const rb_execution_context_t *ec = GET_EC(); + rb_control_frame_t *cfp; + int line; + + def->body.attr.id = (ID)(VALUE)opts; + + cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp); + + if (cfp && (line = rb_vm_get_sourceline(cfp))) { + VALUE location = rb_ary_new3(2, rb_iseq_path(cfp->iseq), INT2FIX(line)); + RB_OBJ_WRITE(me, &def->body.attr.location, rb_ary_freeze(location)); + } + else { + VM_ASSERT(def->body.attr.location == 0); + } + return; + } + case VM_METHOD_TYPE_BMETHOD: RB_OBJ_WRITE(me, &def->body.bmethod.proc, (VALUE)opts); RB_OBJ_WRITE(me, &def->body.bmethod.defined_ractor, rb_ractor_self(GET_RACTOR())); - return; - case VM_METHOD_TYPE_NOTIMPLEMENTED: - setup_method_cfunc_struct(UNALIGNED_MEMBER_PTR(def, body.cfunc), rb_f_notimplement, -1); - return; - case VM_METHOD_TYPE_OPTIMIZED: - def->body.optimize_type = (enum method_optimized_type)(intptr_t)opts; - return; - case VM_METHOD_TYPE_REFINED: - { - const rb_method_refined_t *refined = (rb_method_refined_t *)opts; - RB_OBJ_WRITE(me, &def->body.refined.orig_me, refined->orig_me); - RB_OBJ_WRITE(me, &def->body.refined.owner, refined->owner); - return; - } - case VM_METHOD_TYPE_ALIAS: - RB_OBJ_WRITE(me, &def->body.alias.original_me, (rb_method_entry_t *)opts); - return; - case VM_METHOD_TYPE_ZSUPER: - case VM_METHOD_TYPE_UNDEF: - case VM_METHOD_TYPE_MISSING: - return; - } + return; + case VM_METHOD_TYPE_NOTIMPLEMENTED: + setup_method_cfunc_struct(UNALIGNED_MEMBER_PTR(def, body.cfunc), (VALUE(*)(ANYARGS))rb_f_notimplement_internal, -1); + return; + case VM_METHOD_TYPE_OPTIMIZED: + def->body.optimized = *(rb_method_optimized_t *)opts; + return; + case VM_METHOD_TYPE_REFINED: + { + RB_OBJ_WRITE(me, &def->body.refined.orig_me, (rb_method_entry_t *)opts); + return; + } + case VM_METHOD_TYPE_ALIAS: + RB_OBJ_WRITE(me, &def->body.alias.original_me, (rb_method_entry_t *)opts); + return; + case VM_METHOD_TYPE_ZSUPER: + case VM_METHOD_TYPE_UNDEF: + case VM_METHOD_TYPE_MISSING: + return; + } } } @@ -521,37 +717,36 @@ method_definition_reset(const rb_method_entry_t *me) switch (def->type) { case VM_METHOD_TYPE_ISEQ: - RB_OBJ_WRITTEN(me, Qundef, def->body.iseq.iseqptr); - RB_OBJ_WRITTEN(me, Qundef, def->body.iseq.cref); - break; + RB_OBJ_WRITTEN(me, Qundef, def->body.iseq.iseqptr); + RB_OBJ_WRITTEN(me, Qundef, def->body.iseq.cref); + break; case VM_METHOD_TYPE_ATTRSET: case VM_METHOD_TYPE_IVAR: - RB_OBJ_WRITTEN(me, Qundef, def->body.attr.location); - break; + RB_OBJ_WRITTEN(me, Qundef, def->body.attr.location); + break; case VM_METHOD_TYPE_BMETHOD: RB_OBJ_WRITTEN(me, Qundef, def->body.bmethod.proc); RB_OBJ_WRITTEN(me, Qundef, def->body.bmethod.defined_ractor); /* give up to check all in a list */ if (def->body.bmethod.hooks) rb_gc_writebarrier_remember((VALUE)me); - break; + break; case VM_METHOD_TYPE_REFINED: - RB_OBJ_WRITTEN(me, Qundef, def->body.refined.orig_me); - RB_OBJ_WRITTEN(me, Qundef, def->body.refined.owner); - break; + RB_OBJ_WRITTEN(me, Qundef, def->body.refined.orig_me); + break; case VM_METHOD_TYPE_ALIAS: - RB_OBJ_WRITTEN(me, Qundef, def->body.alias.original_me); - break; + RB_OBJ_WRITTEN(me, Qundef, def->body.alias.original_me); + break; case VM_METHOD_TYPE_CFUNC: case VM_METHOD_TYPE_ZSUPER: case VM_METHOD_TYPE_MISSING: case VM_METHOD_TYPE_OPTIMIZED: case VM_METHOD_TYPE_UNDEF: case VM_METHOD_TYPE_NOTIMPLEMENTED: - break; + break; } } -MJIT_FUNC_EXPORTED rb_method_definition_t * +rb_method_definition_t * rb_method_definition_create(rb_method_type_t type, ID mid) { rb_method_definition_t *def; @@ -563,26 +758,15 @@ rb_method_definition_create(rb_method_type_t type, ID mid) return def; } -static rb_method_definition_t * -method_definition_addref(rb_method_definition_t *def) -{ - def->alias_count++; - if (METHOD_DEBUG) fprintf(stderr, "+%p-%s:%d\n", (void *)def, rb_id2name(def->original_id), def->alias_count); - return def; -} - -static rb_method_definition_t * -method_definition_addref_complement(rb_method_definition_t *def) -{ - def->complemented_count++; - if (METHOD_DEBUG) fprintf(stderr, "+%p-%s:%d\n", (void *)def, rb_id2name(def->original_id), def->complemented_count); - return def; -} - static rb_method_entry_t * -rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, const rb_method_definition_t *def) +rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, rb_method_definition_t *def, bool complement) { - rb_method_entry_t *me = (rb_method_entry_t *)rb_imemo_new(imemo_ment, (VALUE)def, (VALUE)called_id, owner, defined_class); + if (def) method_definition_addref(def, complement); + rb_method_entry_t *me = IMEMO_NEW(rb_method_entry_t, imemo_ment, defined_class); + *((rb_method_definition_t **)&me->def) = def; + me->called_id = called_id; + me->owner = owner; + return me; } @@ -591,11 +775,11 @@ filter_defined_class(VALUE klass) { switch (BUILTIN_TYPE(klass)) { case T_CLASS: - return klass; + return klass; case T_MODULE: - return 0; + return 0; case T_ICLASS: - break; + break; default: break; } @@ -603,56 +787,65 @@ filter_defined_class(VALUE klass) } 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, 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, false); METHOD_ENTRY_FLAGS_SET(me, visi, ruby_running ? FALSE : TRUE); if (def != NULL) method_definition_reset(me); return me; } +// Return a cloned ME that's not invalidated (MEs are disposable for caching). const rb_method_entry_t * rb_method_entry_clone(const rb_method_entry_t *src_me) { - rb_method_entry_t *me = rb_method_entry_alloc(src_me->called_id, src_me->owner, src_me->defined_class, - method_definition_addref(src_me->def)); - if (METHOD_ENTRY_COMPLEMENTED(src_me)) { - method_definition_addref_complement(src_me->def); - } + rb_method_entry_t *me = rb_method_entry_alloc(src_me->called_id, src_me->owner, src_me->defined_class, src_me->def, METHOD_ENTRY_COMPLEMENTED(src_me)); METHOD_ENTRY_FLAGS_COPY(me, src_me); + + // Also clone inner ME in case of refinement ME + if (src_me->def && + src_me->def->type == VM_METHOD_TYPE_REFINED && + src_me->def->body.refined.orig_me) { + const rb_method_entry_t *orig_me = src_me->def->body.refined.orig_me; + VM_ASSERT(orig_me->def->type != VM_METHOD_TYPE_REFINED); + + rb_method_entry_t *orig_clone = rb_method_entry_alloc(orig_me->called_id, + orig_me->owner, orig_me->defined_class, orig_me->def, METHOD_ENTRY_COMPLEMENTED(orig_me)); + METHOD_ENTRY_FLAGS_COPY(orig_clone, orig_me); + + // Clone definition, since writing a VALUE to a shared definition + // can create reference edges we can't run WBs for. + rb_method_definition_t *clone_def = + rb_method_definition_create(VM_METHOD_TYPE_REFINED, src_me->called_id); + rb_method_definition_set(me, clone_def, orig_clone); + } return me; } -MJIT_FUNC_EXPORTED const rb_callable_method_entry_t * +const rb_callable_method_entry_t * rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, ID called_id, VALUE defined_class) { rb_method_definition_t *def = src_me->def; rb_method_entry_t *me; - struct { - const struct rb_method_entry_struct *orig_me; - VALUE owner; - } refined = {0}; + const rb_method_entry_t *refined_orig_me = NULL; if (!src_me->defined_class && - def->type == VM_METHOD_TYPE_REFINED && - def->body.refined.orig_me) { - const rb_method_entry_t *orig_me = - rb_method_entry_clone(def->body.refined.orig_me); - RB_OBJ_WRITE((VALUE)orig_me, &orig_me->defined_class, defined_class); - refined.orig_me = orig_me; - refined.owner = orig_me->owner; - def = NULL; - } - else { - def = method_definition_addref_complement(def); + def->type == VM_METHOD_TYPE_REFINED && + def->body.refined.orig_me) { + const rb_method_entry_t *orig_me = + rb_method_entry_clone(def->body.refined.orig_me); + RB_OBJ_WRITE((VALUE)orig_me, &orig_me->defined_class, defined_class); + refined_orig_me = orig_me; + def = NULL; } - me = rb_method_entry_alloc(called_id, src_me->owner, defined_class, def); + + me = rb_method_entry_alloc(called_id, src_me->owner, defined_class, def, true); METHOD_ENTRY_FLAGS_COPY(me, src_me); METHOD_ENTRY_COMPLEMENTED_SET(me); if (!def) { - def = rb_method_definition_create(VM_METHOD_TYPE_REFINED, called_id); - rb_method_definition_set(me, def, &refined); + def = rb_method_definition_create(VM_METHOD_TYPE_REFINED, called_id); + rb_method_definition_set(me, def, (void *)refined_orig_me); } VM_ASSERT(RB_TYPE_P(me->owner, T_MODULE)); @@ -663,7 +856,8 @@ rb_method_entry_complement_defined_class(const rb_method_entry_t *src_me, ID cal void rb_method_entry_copy(rb_method_entry_t *dst, const rb_method_entry_t *src) { - *(rb_method_definition_t **)&dst->def = method_definition_addref(src->def); + rb_method_definition_release(dst->def); + *(rb_method_definition_t **)&dst->def = method_definition_addref(src->def, METHOD_ENTRY_COMPLEMENTED(src)); method_definition_reset(dst); dst->called_id = src->called_id; RB_OBJ_WRITE((VALUE)dst, &dst->owner, src->owner); @@ -675,28 +869,23 @@ static void make_method_entry_refined(VALUE owner, rb_method_entry_t *me) { if (me->def->type == VM_METHOD_TYPE_REFINED) { - return; + return; } else { - struct { - struct rb_method_entry_struct *orig_me; - VALUE owner; - } refined; - rb_method_definition_t *def; + rb_method_definition_t *def; - rb_vm_check_redefinition_opt_method(me, me->owner); + rb_vm_check_redefinition_opt_method(me, me->owner); - refined.orig_me = - rb_method_entry_alloc(me->called_id, me->owner, - me->defined_class ? - me->defined_class : owner, - method_definition_addref(me->def)); - METHOD_ENTRY_FLAGS_COPY(refined.orig_me, me); - refined.owner = owner; + struct rb_method_entry_struct *orig_me = + rb_method_entry_alloc(me->called_id, me->owner, + me->defined_class ? me->defined_class : owner, + me->def, + true); + METHOD_ENTRY_FLAGS_COPY(orig_me, me); - def = rb_method_definition_create(VM_METHOD_TYPE_REFINED, me->called_id); - rb_method_definition_set(me, def, (void *)&refined); - METHOD_ENTRY_VISI_SET(me, METHOD_VISI_PUBLIC); + def = rb_method_definition_create(VM_METHOD_TYPE_REFINED, me->called_id); + rb_method_definition_set(me, def, orig_me); + METHOD_ENTRY_VISI_SET(me, METHOD_VISI_PUBLIC); } } @@ -707,10 +896,10 @@ lookup_method_table(VALUE klass, ID id) struct rb_id_table *m_tbl = RCLASS_M_TBL(klass); if (rb_id_table_lookup(m_tbl, id, &body)) { - return (rb_method_entry_t *) body; + return (rb_method_entry_t *) body; } else { - return 0; + return 0; } } @@ -720,11 +909,11 @@ rb_add_refined_method_entry(VALUE refined_class, ID mid) rb_method_entry_t *me = lookup_method_table(refined_class, mid); if (me) { - make_method_entry_refined(refined_class, me); - rb_clear_method_cache(refined_class, mid); + make_method_entry_refined(refined_class, me); + rb_clear_method_cache(refined_class, mid); } else { - rb_add_method(refined_class, mid, VM_METHOD_TYPE_REFINED, 0, METHOD_VISI_PUBLIC); + rb_add_method(refined_class, mid, VM_METHOD_TYPE_REFINED, 0, METHOD_VISI_PUBLIC); } } @@ -735,11 +924,11 @@ check_override_opt_method_i(VALUE klass, VALUE arg) const rb_method_entry_t *me, *newme; if (vm_redefinition_check_flag(klass)) { - me = lookup_method_table(RCLASS_ORIGIN(klass), mid); - if (me) { - newme = rb_method_entry(klass, mid); - if (newme != me) rb_vm_check_redefinition_opt_method(me, me->owner); - } + me = lookup_method_table(RCLASS_ORIGIN(klass), mid); + if (me) { + newme = rb_method_entry(klass, mid); + if (newme != me) rb_vm_check_redefinition_opt_method(me, me->owner); + } } rb_class_foreach_subclass(klass, check_override_opt_method_i, (VALUE)mid); } @@ -760,7 +949,7 @@ check_override_opt_method(VALUE klass, VALUE mid) */ static rb_method_entry_t * rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibility_t visi, - rb_method_type_t type, rb_method_definition_t *def, ID original_id, void *opts) + rb_method_type_t type, rb_method_definition_t *def, ID original_id, void *opts) { rb_method_entry_t *me; struct rb_id_table *mtbl; @@ -769,37 +958,37 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil VALUE orig_klass; if (NIL_P(klass)) { - klass = rb_cObject; + klass = rb_cObject; } orig_klass = klass; - if (!FL_TEST(klass, FL_SINGLETON) && - type != VM_METHOD_TYPE_NOTIMPLEMENTED && - type != VM_METHOD_TYPE_ZSUPER) { - switch (mid) { - case idInitialize: - case idInitialize_copy: - case idInitialize_clone: - case idInitialize_dup: - case idRespond_to_missing: - visi = METHOD_VISI_PRIVATE; - } + if (!RCLASS_SINGLETON_P(klass) && + type != VM_METHOD_TYPE_NOTIMPLEMENTED && + type != VM_METHOD_TYPE_ZSUPER) { + switch (mid) { + case idInitialize: + case idInitialize_copy: + case idInitialize_clone: + case idInitialize_dup: + case idRespond_to_missing: + visi = METHOD_VISI_PRIVATE; + } } if (type != VM_METHOD_TYPE_REFINED) { rb_class_modify_check(klass); } - if (FL_TEST(klass, RMODULE_IS_REFINEMENT)) { - VALUE refined_class = rb_refinement_module_get_refined_class(klass); - rb_add_refined_method_entry(refined_class, mid); + if (RB_TYPE_P(klass, T_MODULE) && FL_TEST(klass, RMODULE_IS_REFINEMENT)) { + VALUE refined_class = rb_refinement_module_get_refined_class(klass); + rb_add_refined_method_entry(refined_class, mid); } if (type == VM_METHOD_TYPE_REFINED) { - rb_method_entry_t *old_me = lookup_method_table(RCLASS_ORIGIN(klass), mid); - if (old_me) rb_vm_check_redefinition_opt_method(old_me, klass); + rb_method_entry_t *old_me = lookup_method_table(RCLASS_ORIGIN(klass), mid); + if (old_me) rb_vm_check_redefinition_opt_method(old_me, klass); } else { - klass = RCLASS_ORIGIN(klass); + klass = RCLASS_ORIGIN(klass); if (klass != orig_klass) { rb_clear_method_cache(orig_klass, mid); } @@ -808,46 +997,49 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil /* check re-definition */ if (rb_id_table_lookup(mtbl, mid, &data)) { - rb_method_entry_t *old_me = (rb_method_entry_t *)data; - rb_method_definition_t *old_def = old_me->def; - - if (rb_method_definition_eq(old_def, def)) return old_me; - rb_vm_check_redefinition_opt_method(old_me, klass); - - if (old_def->type == VM_METHOD_TYPE_REFINED) make_refined = 1; - - if (RTEST(ruby_verbose) && - type != VM_METHOD_TYPE_UNDEF && - (old_def->alias_count == 0) && - !make_refined && - old_def->type != VM_METHOD_TYPE_UNDEF && - old_def->type != VM_METHOD_TYPE_ZSUPER && - old_def->type != VM_METHOD_TYPE_ALIAS) { - const rb_iseq_t *iseq = 0; - - rb_warning("method redefined; discarding old %"PRIsVALUE, rb_id2str(mid)); - switch (old_def->type) { - case VM_METHOD_TYPE_ISEQ: - iseq = def_iseq_ptr(old_def); - break; - case VM_METHOD_TYPE_BMETHOD: + rb_method_entry_t *old_me = (rb_method_entry_t *)data; + rb_method_definition_t *old_def = old_me->def; + + if (rb_method_definition_eq(old_def, def)) return old_me; + rb_vm_check_redefinition_opt_method(old_me, klass); + + if (old_def->type == VM_METHOD_TYPE_REFINED) make_refined = 1; + + if (RTEST(ruby_verbose) && + type != VM_METHOD_TYPE_UNDEF && + (old_def->aliased == false) && + (!old_def->no_redef_warning) && + !make_refined && + old_def->type != VM_METHOD_TYPE_UNDEF && + old_def->type != VM_METHOD_TYPE_ZSUPER && + old_def->type != VM_METHOD_TYPE_ALIAS) { + const rb_iseq_t *iseq = 0; + + rb_warning("method redefined; discarding old %"PRIsVALUE, rb_id2str(mid)); + switch (old_def->type) { + case VM_METHOD_TYPE_ISEQ: + iseq = def_iseq_ptr(old_def); + break; + case VM_METHOD_TYPE_BMETHOD: iseq = rb_proc_get_iseq(old_def->body.bmethod.proc, 0); - break; - default: - break; - } - if (iseq) { - rb_compile_warning(RSTRING_PTR(rb_iseq_path(iseq)), - FIX2INT(iseq->body->location.first_lineno), - "previous definition of %"PRIsVALUE" was here", - rb_id2str(old_def->original_id)); - } - } + break; + default: + break; + } + if (iseq) { + rb_compile_warning(RSTRING_PTR(rb_iseq_path(iseq)), + ISEQ_BODY(iseq)->location.first_lineno, + "previous definition of %"PRIsVALUE" was here", + rb_id2str(old_def->original_id)); + } + } } /* create method entry */ me = rb_method_entry_create(mid, defined_class, visi, NULL); - if (def == NULL) def = rb_method_definition_create(type, original_id); + if (def == NULL) { + def = rb_method_definition_create(type, original_id); + } rb_method_definition_set(me, def, opts); rb_clear_method_cache(klass, mid); @@ -864,13 +1056,13 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil } /* check mid */ if (mid == object_id || mid == id__send__) { - if (type == VM_METHOD_TYPE_ISEQ && search_method(klass, mid, 0)) { - rb_warn("redefining `%s' may cause serious problems", rb_id2name(mid)); - } + if (type == VM_METHOD_TYPE_ISEQ && search_method(klass, mid, 0)) { + rb_warn("redefining '%s' may cause serious problems", rb_id2name(mid)); + } } if (make_refined) { - make_method_entry_refined(klass, me); + make_method_entry_refined(klass, me); } rb_method_table_insert(klass, mtbl, mid, me); @@ -879,28 +1071,146 @@ rb_method_entry_make(VALUE klass, ID mid, VALUE defined_class, rb_method_visibil /* check optimized method override by a prepended module */ if (RB_TYPE_P(orig_klass, T_MODULE)) { - check_override_opt_method(klass, (VALUE)mid); + check_override_opt_method(klass, (VALUE)mid); } return me; } +static rb_method_entry_t *rb_method_entry_alloc(ID called_id, VALUE owner, VALUE defined_class, rb_method_definition_t *def, bool refined); + +static st_table * +overloaded_cme_table(void) +{ + VM_ASSERT(GET_VM()->overloaded_cme_table != NULL); + return GET_VM()->overloaded_cme_table; +} + +#if VM_CHECK_MODE > 0 +static int +vm_dump_overloaded_cme_table(st_data_t key, st_data_t val, st_data_t dmy) +{ + fprintf(stderr, "key: "); rp(key); + fprintf(stderr, "val: "); rp(val); + return ST_CONTINUE; +} + +void +rb_vm_dump_overloaded_cme_table(void) +{ + fprintf(stderr, "== rb_vm_dump_overloaded_cme_table\n"); + st_foreach(overloaded_cme_table(), vm_dump_overloaded_cme_table, 0); +} +#endif + +static int +lookup_overloaded_cme_i(st_data_t *key, st_data_t *value, st_data_t data, int existing) +{ + if (existing) { + const rb_callable_method_entry_t *cme = (const rb_callable_method_entry_t *)*key; + const rb_callable_method_entry_t *monly_cme = (const rb_callable_method_entry_t *)*value; + const rb_callable_method_entry_t **ptr = (const rb_callable_method_entry_t **)data; + + if (rb_objspace_garbage_object_p((VALUE)cme) || + rb_objspace_garbage_object_p((VALUE)monly_cme)) { + *ptr = NULL; + return ST_DELETE; + } + else { + *ptr = monly_cme; + } + } + + return ST_STOP; +} + +static const rb_callable_method_entry_t * +lookup_overloaded_cme(const rb_callable_method_entry_t *cme) +{ + ASSERT_vm_locking(); + + const rb_callable_method_entry_t *monly_cme = NULL; + st_update(overloaded_cme_table(), (st_data_t)cme, lookup_overloaded_cme_i, (st_data_t)&monly_cme); + return monly_cme; +} + +#if VM_CHECK_MODE > 0 +const rb_callable_method_entry_t * +rb_vm_lookup_overloaded_cme(const rb_callable_method_entry_t *cme) +{ + return lookup_overloaded_cme(cme); +} +#endif + +static void +delete_overloaded_cme(const rb_callable_method_entry_t *cme) +{ + st_data_t cme_data = (st_data_t)cme; + ASSERT_vm_locking(); + st_delete(overloaded_cme_table(), &cme_data, NULL); +} + +static const rb_callable_method_entry_t * +get_overloaded_cme(const rb_callable_method_entry_t *cme) +{ + const rb_callable_method_entry_t *monly_cme = lookup_overloaded_cme(cme); + + if (monly_cme && !METHOD_ENTRY_INVALIDATED(monly_cme)) { + return monly_cme; + } + else { + // create + rb_method_definition_t *def = rb_method_definition_create(VM_METHOD_TYPE_ISEQ, cme->def->original_id); + rb_method_entry_t *me = rb_method_entry_alloc(cme->called_id, + cme->owner, + cme->defined_class, + def, + false); + + RB_OBJ_WRITE(me, &def->body.iseq.cref, cme->def->body.iseq.cref); + RB_OBJ_WRITE(me, &def->body.iseq.iseqptr, ISEQ_BODY(cme->def->body.iseq.iseqptr)->mandatory_only_iseq); + + ASSERT_vm_locking(); + st_insert(overloaded_cme_table(), (st_data_t)cme, (st_data_t)me); + + METHOD_ENTRY_VISI_SET(me, METHOD_ENTRY_VISI(cme)); + return (rb_callable_method_entry_t *)me; + } +} + +const rb_callable_method_entry_t * +rb_check_overloaded_cme(const rb_callable_method_entry_t *cme, const struct rb_callinfo * const ci) +{ + if (UNLIKELY(cme->def->iseq_overload) && + (vm_ci_flag(ci) & (VM_CALL_ARGS_SIMPLE)) && + (int)vm_ci_argc(ci) == ISEQ_BODY(method_entry_iseqptr(cme))->param.lead_num) { + VM_ASSERT(cme->def->type == VM_METHOD_TYPE_ISEQ); // iseq_overload is marked only on ISEQ methods + + cme = get_overloaded_cme(cme); + + VM_ASSERT(cme != NULL); + METHOD_ENTRY_CACHED_SET((struct rb_callable_method_entry_struct *)cme); + } + + return cme; +} + #define CALL_METHOD_HOOK(klass, hook, mid) do { \ - const VALUE arg = ID2SYM(mid); \ - VALUE recv_class = (klass); \ - ID hook_id = (hook); \ - if (FL_TEST((klass), FL_SINGLETON)) { \ - recv_class = rb_ivar_get((klass), attached); \ - hook_id = singleton_##hook; \ - } \ - rb_funcallv(recv_class, hook_id, 1, &arg); \ + const VALUE arg = ID2SYM(mid); \ + VALUE recv_class = (klass); \ + ID hook_id = (hook); \ + if (RCLASS_SINGLETON_P((klass))) { \ + recv_class = RCLASS_ATTACHED_OBJECT((klass)); \ + hook_id = singleton_##hook; \ + } \ + rb_funcallv(recv_class, hook_id, 1, &arg); \ } while (0) static void method_added(VALUE klass, ID mid) { if (ruby_running) { - CALL_METHOD_HOOK(klass, added, mid); + CALL_METHOD_HOOK(klass, added, mid); } } @@ -910,11 +1220,11 @@ rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *opts, rb_method_ rb_method_entry_make(klass, mid, klass, visi, type, NULL, mid, opts); if (type != VM_METHOD_TYPE_UNDEF && type != VM_METHOD_TYPE_REFINED) { - method_added(klass, mid); + method_added(klass, mid); } } -MJIT_FUNC_EXPORTED void +void rb_add_method_iseq(VALUE klass, ID mid, const rb_iseq_t *iseq, rb_cref_t *cref, rb_method_visibility_t visi) { struct { /* should be same fields with rb_method_iseq_struct */ @@ -924,15 +1234,20 @@ rb_add_method_iseq(VALUE klass, ID mid, const rb_iseq_t *iseq, rb_cref_t *cref, iseq_body.iseqptr = iseq; iseq_body.cref = cref; + rb_add_method(klass, mid, VM_METHOD_TYPE_ISEQ, &iseq_body, visi); } static rb_method_entry_t * method_entry_set(VALUE klass, ID mid, const rb_method_entry_t *me, - rb_method_visibility_t visi, VALUE defined_class) + rb_method_visibility_t visi, VALUE defined_class) { rb_method_entry_t *newme = rb_method_entry_make(klass, mid, defined_class, visi, - me->def->type, method_definition_addref(me->def), 0, NULL); + me->def->type, me->def, 0, NULL); + if (newme == me) { + me->def->no_redef_warning = TRUE; + } + method_added(klass, mid); return newme; } @@ -949,7 +1264,10 @@ void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE)) { Check_Type(klass, T_CLASS); - RCLASS_ALLOCATOR(klass) = func; + if (RCLASS_SINGLETON_P(klass)) { + rb_raise(rb_eTypeError, "can't define an allocator for a singleton class"); + } + RCLASS_SET_ALLOCATOR(klass, func); } void @@ -964,9 +1282,9 @@ rb_get_alloc_func(VALUE klass) Check_Type(klass, T_CLASS); for (; klass; klass = RCLASS_SUPER(klass)) { - rb_alloc_func_t allocator = RCLASS_ALLOCATOR(klass); - if (allocator == UNDEF_ALLOC_FUNC) break; - if (allocator) return allocator; + rb_alloc_func_t allocator = RCLASS_ALLOCATOR(klass); + if (allocator == UNDEF_ALLOC_FUNC) break; + if (allocator) return allocator; } return 0; } @@ -985,7 +1303,7 @@ search_method0(VALUE klass, ID id, VALUE *defined_class_ptr, bool skip_refined) RB_DEBUG_COUNTER_INC(mc_search); for (; klass; klass = RCLASS_SUPER(klass)) { - RB_DEBUG_COUNTER_INC(mc_search_super); + RB_DEBUG_COUNTER_INC(mc_search_super); if ((me = lookup_method_table(klass, id)) != 0) { if (!skip_refined || me->def->type != VM_METHOD_TYPE_REFINED || me->def->body.refined.orig_me) { @@ -1021,7 +1339,7 @@ search_method_protect(VALUE klass, ID id, VALUE *defined_class_ptr) } } -MJIT_FUNC_EXPORTED const rb_method_entry_t * +const rb_method_entry_t * rb_method_entry(VALUE klass, ID id) { return search_method_protect(klass, id, NULL); @@ -1115,7 +1433,6 @@ cache_callable_method_entry(VALUE klass, ID mid, const rb_callable_method_entry_ VM_ASSERT(cme != NULL); struct rb_id_table *cc_tbl = RCLASS_CC_TBL(klass); - struct rb_class_cc_entries *ccs; VALUE ccs_data; if (!cc_tbl) { @@ -1123,12 +1440,13 @@ cache_callable_method_entry(VALUE klass, ID mid, const rb_callable_method_entry_ } if (rb_id_table_lookup(cc_tbl, mid, &ccs_data)) { - ccs = (struct rb_class_cc_entries *)ccs_data; +#if VM_CHECK_MODE > 0 + struct rb_class_cc_entries *ccs = (struct rb_class_cc_entries *)ccs_data; VM_ASSERT(ccs->cme == cme); +#endif } else { - ccs = vm_ccs_create(klass, cme); - rb_id_table_insert(cc_tbl, mid, (VALUE)ccs); + vm_ccs_create(klass, cc_tbl, mid, cme); } } @@ -1143,7 +1461,7 @@ negative_cme(ID mid) cme = (rb_callable_method_entry_t *)cme_data; } else { - cme = (rb_callable_method_entry_t *)rb_method_entry_alloc(mid, Qnil, Qnil, NULL); + cme = (rb_callable_method_entry_t *)rb_method_entry_alloc(mid, Qnil, Qnil, NULL, false); rb_id_table_insert(vm->negative_cme_table, mid, (VALUE)cme); } @@ -1152,7 +1470,7 @@ negative_cme(ID mid) } static const rb_callable_method_entry_t * -callable_method_entry(VALUE klass, ID mid, VALUE *defined_class_ptr) +callable_method_entry_or_negative(VALUE klass, ID mid, VALUE *defined_class_ptr) { const rb_callable_method_entry_t *cme; @@ -1181,10 +1499,26 @@ callable_method_entry(VALUE klass, ID mid, VALUE *defined_class_ptr) } RB_VM_LOCK_LEAVE(); + return cme; +} + +// This is exposed for YJIT so that we can make assumptions that methods are +// not defined. +const rb_callable_method_entry_t * +rb_callable_method_entry_or_negative(VALUE klass, ID mid) +{ + return callable_method_entry_or_negative(klass, mid, NULL); +} + +static const rb_callable_method_entry_t * +callable_method_entry(VALUE klass, ID mid, VALUE *defined_class_ptr) +{ + const rb_callable_method_entry_t *cme; + cme = callable_method_entry_or_negative(klass, mid, defined_class_ptr); return !UNDEFINED_METHOD_ENTRY_P(cme) ? cme : NULL; } -MJIT_FUNC_EXPORTED const rb_callable_method_entry_t * +const rb_callable_method_entry_t * rb_callable_method_entry(VALUE klass, ID mid) { return callable_method_entry(klass, mid, NULL); @@ -1198,31 +1532,31 @@ method_entry_resolve_refinement(VALUE klass, ID id, int with_refinement, VALUE * const rb_method_entry_t *me = search_method_protect(klass, id, defined_class_ptr); if (me) { - if (me->def->type == VM_METHOD_TYPE_REFINED) { - if (with_refinement) { - const rb_cref_t *cref = rb_vm_cref(); - VALUE refinements = cref ? CREF_REFINEMENTS(cref) : Qnil; - me = resolve_refined_method(refinements, me, defined_class_ptr); - } - else { - me = resolve_refined_method(Qnil, me, defined_class_ptr); - } + if (me->def->type == VM_METHOD_TYPE_REFINED) { + if (with_refinement) { + const rb_cref_t *cref = rb_vm_cref(); + VALUE refinements = cref ? CREF_REFINEMENTS(cref) : Qnil; + me = resolve_refined_method(refinements, me, defined_class_ptr); + } + else { + me = resolve_refined_method(Qnil, me, defined_class_ptr); + } - if (UNDEFINED_METHOD_ENTRY_P(me)) me = NULL; - } + if (UNDEFINED_METHOD_ENTRY_P(me)) me = NULL; + } } return me; } -MJIT_FUNC_EXPORTED const rb_method_entry_t * +const rb_method_entry_t * rb_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { return method_entry_resolve_refinement(klass, id, TRUE, defined_class_ptr); } static const rb_callable_method_entry_t * -callable_method_entry_refeinements0(VALUE klass, ID id, VALUE *defined_class_ptr, bool with_refinements, +callable_method_entry_refinements0(VALUE klass, ID id, VALUE *defined_class_ptr, bool with_refinements, const rb_callable_method_entry_t *cme) { if (cme == NULL || LIKELY(cme->def->type != VM_METHOD_TYPE_REFINED)) { @@ -1236,22 +1570,22 @@ callable_method_entry_refeinements0(VALUE klass, ID id, VALUE *defined_class_ptr } static const rb_callable_method_entry_t * -callable_method_entry_refeinements(VALUE klass, ID id, VALUE *defined_class_ptr, bool with_refinements) +callable_method_entry_refinements(VALUE klass, ID id, VALUE *defined_class_ptr, bool with_refinements) { const rb_callable_method_entry_t *cme = callable_method_entry(klass, id, defined_class_ptr); - return callable_method_entry_refeinements0(klass, id, defined_class_ptr, with_refinements, cme); + return callable_method_entry_refinements0(klass, id, defined_class_ptr, with_refinements, cme); } -MJIT_FUNC_EXPORTED const rb_callable_method_entry_t * +const rb_callable_method_entry_t * rb_callable_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { - return callable_method_entry_refeinements(klass, id, defined_class_ptr, true); + return callable_method_entry_refinements(klass, id, defined_class_ptr, true); } static const rb_callable_method_entry_t * callable_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { - return callable_method_entry_refeinements(klass, id, defined_class_ptr, false); + return callable_method_entry_refinements(klass, id, defined_class_ptr, false); } const rb_method_entry_t * @@ -1260,7 +1594,7 @@ rb_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class_ptr return method_entry_resolve_refinement(klass, id, FALSE, defined_class_ptr); } -MJIT_FUNC_EXPORTED const rb_callable_method_entry_t * +const rb_callable_method_entry_t * rb_callable_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class_ptr) { VALUE defined_class, *dcp = defined_class_ptr ? defined_class_ptr : &defined_class; @@ -1272,18 +1606,18 @@ static const rb_method_entry_t * resolve_refined_method(VALUE refinements, const rb_method_entry_t *me, VALUE *defined_class_ptr) { while (me && me->def->type == VM_METHOD_TYPE_REFINED) { - VALUE refinement; + VALUE refinement; const rb_method_entry_t *tmp_me; VALUE super; - refinement = find_refinement(refinements, me->owner); + refinement = find_refinement(refinements, me->owner); if (!NIL_P(refinement)) { - tmp_me = search_method_protect(refinement, me->called_id, defined_class_ptr); + tmp_me = search_method_protect(refinement, me->called_id, defined_class_ptr); - if (tmp_me && tmp_me->def->type != VM_METHOD_TYPE_REFINED) { - return tmp_me; - } - } + if (tmp_me && tmp_me->def->type != VM_METHOD_TYPE_REFINED) { + return tmp_me; + } + } tmp_me = me->def->body.refined.orig_me; if (tmp_me) { @@ -1307,7 +1641,6 @@ rb_resolve_refined_method(VALUE refinements, const rb_method_entry_t *me) return resolve_refined_method(refinements, me, NULL); } -MJIT_FUNC_EXPORTED const rb_callable_method_entry_t * rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_entry_t *me) { @@ -1315,10 +1648,10 @@ rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_e const rb_method_entry_t *resolved_me = resolve_refined_method(refinements, (const rb_method_entry_t *)me, &defined_class); if (resolved_me && resolved_me->defined_class == 0) { - return rb_method_entry_complement_defined_class(resolved_me, me->called_id, defined_class); + return rb_method_entry_complement_defined_class(resolved_me, me->called_id, defined_class); } else { - return (const rb_callable_method_entry_t *)resolved_me; + return (const rb_callable_method_entry_t *)resolved_me; } } @@ -1329,18 +1662,18 @@ remove_method(VALUE klass, ID mid) rb_method_entry_t *me = 0; VALUE self = klass; - klass = RCLASS_ORIGIN(klass); rb_class_modify_check(klass); + klass = RCLASS_ORIGIN(klass); if (mid == object_id || mid == id__send__ || mid == idInitialize) { - rb_warn("removing `%s' may cause serious problems", rb_id2name(mid)); + rb_warn("removing '%s' may cause serious problems", rb_id2name(mid)); } if (!rb_id_table_lookup(RCLASS_M_TBL(klass), mid, &data) || - !(me = (rb_method_entry_t *)data) || - (!me->def || me->def->type == VM_METHOD_TYPE_UNDEF) || + !(me = (rb_method_entry_t *)data) || + (!me->def || me->def->type == VM_METHOD_TYPE_UNDEF) || UNDEFINED_REFINED_METHOD_P(me->def)) { - rb_name_err_raise("method `%1$s' not defined in %2$s", - klass, ID2SYM(mid)); + rb_name_err_raise("method '%1$s' not defined in %2$s", + klass, ID2SYM(mid)); } if (klass != self) { @@ -1352,7 +1685,7 @@ remove_method(VALUE klass, ID mid) rb_vm_check_redefinition_opt_method(me, klass); if (me->def->type == VM_METHOD_TYPE_REFINED) { - rb_add_refined_method_entry(klass, mid); + rb_add_refined_method_entry(klass, mid); } CALL_METHOD_HOOK(self, removed, mid); @@ -1386,13 +1719,13 @@ rb_mod_remove_method(int argc, VALUE *argv, VALUE mod) int i; for (i = 0; i < argc; i++) { - VALUE v = argv[i]; - ID id = rb_check_id(&v); - if (!id) { - rb_name_err_raise("method `%1$s' not defined in %2$s", - mod, v); - } - remove_method(mod, id); + VALUE v = argv[i]; + ID id = rb_check_id(&v); + if (!id) { + rb_name_err_raise("method '%1$s' not defined in %2$s", + mod, v); + } + remove_method(mod, id); } return mod; } @@ -1407,18 +1740,18 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi) me = search_method0(origin_class, name, &defined_class, true); if (!me && RB_TYPE_P(klass, T_MODULE)) { - me = search_method(rb_cObject, name, &defined_class); + me = search_method(rb_cObject, name, &defined_class); } if (UNDEFINED_METHOD_ENTRY_P(me) || - UNDEFINED_REFINED_METHOD_P(me->def)) { - rb_print_undef(klass, name, METHOD_VISI_UNDEF); + UNDEFINED_REFINED_METHOD_P(me->def)) { + rb_print_undef(klass, name, METHOD_VISI_UNDEF); } if (METHOD_ENTRY_VISI(me) != visi) { - rb_vm_check_redefinition_opt_method(me, klass); + rb_vm_check_redefinition_opt_method(me, klass); - if (klass == defined_class || origin_class == defined_class) { + if (klass == defined_class || origin_class == defined_class) { if (me->def->type == VM_METHOD_TYPE_REFINED) { // Refinement method entries should always be public because the refinement // search is always performed. @@ -1430,10 +1763,10 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi) METHOD_ENTRY_VISI_SET(me, visi); } rb_clear_method_cache(klass, name); - } - else { - rb_add_method(klass, name, VM_METHOD_TYPE_ZSUPER, 0, visi); - } + } + else { + rb_add_method(klass, name, VM_METHOD_TYPE_ZSUPER, 0, visi); + } } } @@ -1464,13 +1797,13 @@ method_boundp(VALUE klass, ID id, int ex) default: break; } - } + } - if (cme->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) { - if (ex & BOUND_RESPONDS) return 2; - return 0; - } - return 1; + if (cme->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) { + if (ex & BOUND_RESPONDS) return 2; + return 0; + } + return 1; } return 0; } @@ -1501,7 +1834,7 @@ scope_visibility_check(void) { /* Check for public/protected/private/module_function called inside a method */ rb_control_frame_t *cfp = GET_EC()->cfp+1; - if (cfp && cfp->iseq && cfp->iseq->body->type == ISEQ_TYPE_METHOD) { + if (cfp && cfp->iseq && ISEQ_BODY(cfp->iseq)->type == ISEQ_TYPE_METHOD) { rb_warn("calling %s without arguments inside a method may not have the intended effect", rb_id2name(rb_frame_this_func())); } @@ -1524,31 +1857,31 @@ rb_attr(VALUE klass, ID id, int read, int write, int ex) const rb_cref_t *cref = rb_vm_cref_in_context(klass, klass); if (!ex || !cref) { - visi = METHOD_VISI_PUBLIC; + visi = METHOD_VISI_PUBLIC; } else { switch (vm_scope_visibility_get(ec)) { - case METHOD_VISI_PRIVATE: + case METHOD_VISI_PRIVATE: if (vm_scope_module_func_check(ec)) { - rb_warning("attribute accessor as module_function"); - } - visi = METHOD_VISI_PRIVATE; - break; - case METHOD_VISI_PROTECTED: - visi = METHOD_VISI_PROTECTED; - break; - default: - visi = METHOD_VISI_PUBLIC; - break; - } + rb_warning("attribute accessor as module_function"); + } + visi = METHOD_VISI_PRIVATE; + break; + case METHOD_VISI_PROTECTED: + visi = METHOD_VISI_PROTECTED; + break; + default: + visi = METHOD_VISI_PUBLIC; + break; + } } attriv = rb_intern_str(rb_sprintf("@%"PRIsVALUE, rb_id2str(id))); if (read) { - rb_add_method(klass, id, VM_METHOD_TYPE_IVAR, (void *)attriv, visi); + rb_add_method(klass, id, VM_METHOD_TYPE_IVAR, (void *)attriv, visi); } if (write) { - rb_add_method(klass, rb_id_attrset(id), VM_METHOD_TYPE_ATTRSET, (void *)attriv, visi); + rb_add_method(klass, rb_id_attrset(id), VM_METHOD_TYPE_ATTRSET, (void *)attriv, visi); } } @@ -1558,21 +1891,21 @@ rb_undef(VALUE klass, ID id) const rb_method_entry_t *me; if (NIL_P(klass)) { - rb_raise(rb_eTypeError, "no class to undef method"); + rb_raise(rb_eTypeError, "no class to undef method"); } rb_class_modify_check(klass); if (id == object_id || id == id__send__ || id == idInitialize) { - rb_warn("undefining `%s' may cause serious problems", rb_id2name(id)); + rb_warn("undefining '%s' may cause serious problems", rb_id2name(id)); } me = search_method(klass, id, 0); if (me && me->def->type == VM_METHOD_TYPE_REFINED) { - me = rb_resolve_refined_method(Qnil, me); + me = rb_resolve_refined_method(Qnil, me); } if (UNDEFINED_METHOD_ENTRY_P(me) || - UNDEFINED_REFINED_METHOD_P(me->def)) { - rb_method_name_error(klass, rb_id2str(id)); + UNDEFINED_REFINED_METHOD_P(me->def)) { + rb_method_name_error(klass, rb_id2str(id)); } rb_add_method(klass, id, VM_METHOD_TYPE_UNDEF, 0, METHOD_VISI_PUBLIC); @@ -1622,7 +1955,7 @@ rb_undef(VALUE klass, ID id) * * In child * In parent - * prog.rb:23: undefined method `hello' for #<Child:0x401b3bb4> (NoMethodError) + * prog.rb:23: undefined method 'hello' for #<Child:0x401b3bb4> (NoMethodError) */ static VALUE @@ -1630,12 +1963,12 @@ rb_mod_undef_method(int argc, VALUE *argv, VALUE mod) { int i; for (i = 0; i < argc; i++) { - VALUE v = argv[i]; - ID id = rb_check_id(&v); - if (!id) { - rb_method_name_error(mod, v); - } - rb_undef(mod, id); + VALUE v = argv[i]; + ID id = rb_check_id(&v); + if (!id) { + rb_method_name_error(mod, v); + } + rb_undef(mod, id); } return mod; } @@ -1653,20 +1986,20 @@ check_definition_visibility(VALUE mod, int argc, VALUE *argv) if (!id) return METHOD_VISI_UNDEF; if (argc == 1) { - inc_super = 1; + inc_super = 1; } else { - inc_super = RTEST(include_super); - if (!inc_super) { - lookup_mod = RCLASS_ORIGIN(mod); - } + inc_super = RTEST(include_super); + if (!inc_super) { + lookup_mod = RCLASS_ORIGIN(mod); + } } me = rb_method_entry_without_refinements(lookup_mod, id, NULL); if (me) { - if (me->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) return METHOD_VISI_UNDEF; - if (!inc_super && me->owner != mod) return METHOD_VISI_UNDEF; - return METHOD_ENTRY_VISI(me); + if (me->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) return METHOD_VISI_UNDEF; + if (!inc_super && me->owner != mod) return METHOD_VISI_UNDEF; + return METHOD_ENTRY_VISI(me); } return METHOD_VISI_UNDEF; } @@ -1839,24 +2172,24 @@ original_method_definition(const rb_method_definition_t *def) { again: if (def) { - switch (def->type) { - case VM_METHOD_TYPE_REFINED: - if (def->body.refined.orig_me) { - def = def->body.refined.orig_me->def; - goto again; - } - break; - case VM_METHOD_TYPE_ALIAS: - def = def->body.alias.original_me->def; - goto again; - default: - break; - } + switch (def->type) { + case VM_METHOD_TYPE_REFINED: + if (def->body.refined.orig_me) { + def = def->body.refined.orig_me->def; + goto again; + } + break; + case VM_METHOD_TYPE_ALIAS: + def = def->body.alias.original_me->def; + goto again; + default: + break; + } } return def; } -MJIT_FUNC_EXPORTED int +int rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_definition_t *d2) { d1 = original_method_definition(d1); @@ -1868,29 +2201,30 @@ rb_method_definition_eq(const rb_method_definition_t *d1, const rb_method_defini switch (d1->type) { case VM_METHOD_TYPE_ISEQ: - return d1->body.iseq.iseqptr == d2->body.iseq.iseqptr; + return d1->body.iseq.iseqptr == d2->body.iseq.iseqptr; case VM_METHOD_TYPE_CFUNC: - return - d1->body.cfunc.func == d2->body.cfunc.func && - d1->body.cfunc.argc == d2->body.cfunc.argc; + return + d1->body.cfunc.func == d2->body.cfunc.func && + d1->body.cfunc.argc == d2->body.cfunc.argc; case VM_METHOD_TYPE_ATTRSET: case VM_METHOD_TYPE_IVAR: - return d1->body.attr.id == d2->body.attr.id; + return d1->body.attr.id == d2->body.attr.id; case VM_METHOD_TYPE_BMETHOD: return RTEST(rb_equal(d1->body.bmethod.proc, d2->body.bmethod.proc)); case VM_METHOD_TYPE_MISSING: - return d1->original_id == d2->original_id; + return d1->original_id == d2->original_id; case VM_METHOD_TYPE_ZSUPER: case VM_METHOD_TYPE_NOTIMPLEMENTED: case VM_METHOD_TYPE_UNDEF: - return 1; + return 1; case VM_METHOD_TYPE_OPTIMIZED: - return d1->body.optimize_type == d2->body.optimize_type; + return (d1->body.optimized.type == d2->body.optimized.type) && + (d1->body.optimized.index == d2->body.optimized.index); case VM_METHOD_TYPE_REFINED: case VM_METHOD_TYPE_ALIAS: - break; + break; } - rb_bug("rb_method_definition_eq: unsupported type: %d\n", d1->type); + rb_bug("rb_method_definition_eq: unsupported type: %d", d1->type); } static st_index_t @@ -1903,28 +2237,29 @@ rb_hash_method_definition(st_index_t hash, const rb_method_definition_t *def) switch (def->type) { case VM_METHOD_TYPE_ISEQ: - return rb_hash_uint(hash, (st_index_t)def->body.iseq.iseqptr); + return rb_hash_uint(hash, (st_index_t)def->body.iseq.iseqptr); case VM_METHOD_TYPE_CFUNC: - hash = rb_hash_uint(hash, (st_index_t)def->body.cfunc.func); - return rb_hash_uint(hash, def->body.cfunc.argc); + hash = rb_hash_uint(hash, (st_index_t)def->body.cfunc.func); + return rb_hash_uint(hash, def->body.cfunc.argc); case VM_METHOD_TYPE_ATTRSET: case VM_METHOD_TYPE_IVAR: - return rb_hash_uint(hash, def->body.attr.id); + return rb_hash_uint(hash, def->body.attr.id); case VM_METHOD_TYPE_BMETHOD: return rb_hash_proc(hash, def->body.bmethod.proc); case VM_METHOD_TYPE_MISSING: - return rb_hash_uint(hash, def->original_id); + return rb_hash_uint(hash, def->original_id); case VM_METHOD_TYPE_ZSUPER: case VM_METHOD_TYPE_NOTIMPLEMENTED: case VM_METHOD_TYPE_UNDEF: - return hash; + return hash; case VM_METHOD_TYPE_OPTIMIZED: - return rb_hash_uint(hash, def->body.optimize_type); + hash = rb_hash_uint(hash, def->body.optimized.index); + return rb_hash_uint(hash, def->body.optimized.type); case VM_METHOD_TYPE_REFINED: case VM_METHOD_TYPE_ALIAS: - break; /* unreachable */ + break; /* unreachable */ } - rb_bug("rb_hash_method_definition: unsupported method type (%d)\n", def->type); + rb_bug("rb_hash_method_definition: unsupported method type (%d)", def->type); } st_index_t @@ -1942,7 +2277,7 @@ rb_alias(VALUE klass, ID alias_name, ID original_name) rb_method_visibility_t visi = METHOD_VISI_UNDEF; if (NIL_P(klass)) { - rb_raise(rb_eTypeError, "no class to make alias"); + rb_raise(rb_eTypeError, "no class to make alias"); } rb_class_modify_check(klass); @@ -1951,25 +2286,26 @@ rb_alias(VALUE klass, ID alias_name, ID original_name) orig_me = search_method(klass, original_name, &defined_class); if (orig_me && orig_me->def->type == VM_METHOD_TYPE_REFINED) { - orig_me = rb_resolve_refined_method(Qnil, orig_me); + orig_me = rb_resolve_refined_method(Qnil, orig_me); } if (UNDEFINED_METHOD_ENTRY_P(orig_me) || - UNDEFINED_REFINED_METHOD_P(orig_me->def)) { - if ((!RB_TYPE_P(klass, T_MODULE)) || - (orig_me = search_method(rb_cObject, original_name, &defined_class), - UNDEFINED_METHOD_ENTRY_P(orig_me))) { - rb_print_undef(klass, original_name, METHOD_VISI_UNDEF); - } + UNDEFINED_REFINED_METHOD_P(orig_me->def)) { + if ((!RB_TYPE_P(klass, T_MODULE)) || + (orig_me = search_method(rb_cObject, original_name, &defined_class), + UNDEFINED_METHOD_ENTRY_P(orig_me))) { + rb_print_undef(klass, original_name, METHOD_VISI_UNDEF); + } } switch (orig_me->def->type) { case VM_METHOD_TYPE_ZSUPER: - klass = RCLASS_SUPER(klass); - original_name = orig_me->def->original_id; - visi = METHOD_ENTRY_VISI(orig_me); - goto again; + klass = RCLASS_SUPER(klass); + original_name = orig_me->def->original_id; + visi = METHOD_ENTRY_VISI(orig_me); + goto again; case VM_METHOD_TYPE_ALIAS: + visi = METHOD_ENTRY_VISI(orig_me); orig_me = orig_me->def->body.alias.original_me; VM_ASSERT(orig_me->def->type != VM_METHOD_TYPE_ALIAS); break; @@ -1979,16 +2315,16 @@ rb_alias(VALUE klass, ID alias_name, ID original_name) if (visi == METHOD_VISI_UNDEF) visi = METHOD_ENTRY_VISI(orig_me); if (orig_me->defined_class == 0) { - rb_method_entry_make(target_klass, alias_name, target_klass, visi, - VM_METHOD_TYPE_ALIAS, NULL, orig_me->called_id, - (void *)rb_method_entry_clone(orig_me)); - method_added(target_klass, alias_name); + rb_method_entry_make(target_klass, alias_name, target_klass, visi, + VM_METHOD_TYPE_ALIAS, NULL, orig_me->called_id, + (void *)rb_method_entry_clone(orig_me)); + method_added(target_klass, alias_name); } else { - rb_method_entry_t *alias_me; + rb_method_entry_t *alias_me; - alias_me = method_entry_set(target_klass, alias_name, orig_me, visi, orig_me->owner); - RB_OBJ_WRITE(alias_me, &alias_me->owner, target_klass); + alias_me = method_entry_set(target_klass, alias_name, orig_me, visi, orig_me->owner); + RB_OBJ_WRITE(alias_me, &alias_me->owner, target_klass); RB_OBJ_WRITE(alias_me, &alias_me->defined_class, orig_me->defined_class); } } @@ -2020,7 +2356,7 @@ rb_mod_alias_method(VALUE mod, VALUE newname, VALUE oldname) { ID oldid = rb_check_id(&oldname); if (!oldid) { - rb_print_undef_str(mod, oldname); + rb_print_undef_str(mod, oldname); } VALUE id = rb_to_id(newname); rb_alias(mod, id, oldid); @@ -2032,7 +2368,7 @@ check_and_export_method(VALUE self, VALUE name, rb_method_visibility_t visi) { ID id = rb_check_id(&name); if (!id) { - rb_print_undef_str(self, name); + rb_print_undef_str(self, name); } rb_export_method(self, id, visi); } @@ -2044,9 +2380,9 @@ set_method_visibility(VALUE self, int argc, const VALUE *argv, rb_method_visibil rb_check_frozen(self); if (argc == 0) { - rb_warning("%"PRIsVALUE" with no argument is just ignored", - QUOTE_ID(rb_frame_callee())); - return; + rb_warning("%"PRIsVALUE" with no argument is just ignored", + QUOTE_ID(rb_frame_callee())); + return; } @@ -2055,9 +2391,9 @@ set_method_visibility(VALUE self, int argc, const VALUE *argv, rb_method_visibil if (argc == 1 && (v = rb_check_array_type(argv[0])) != Qnil) { long j; - for (j = 0; j < RARRAY_LEN(v); j++) { - check_and_export_method(self, RARRAY_AREF(v, j), visi); - } + for (j = 0; j < RARRAY_LEN(v); j++) { + check_and_export_method(self, RARRAY_AREF(v, j), visi); + } } else { for (i = 0; i < argc; i++) { @@ -2072,25 +2408,31 @@ set_visibility(int argc, const VALUE *argv, VALUE module, rb_method_visibility_t if (argc == 0) { scope_visibility_check(); rb_scope_visibility_set(visi); + return Qnil; } - else { - set_method_visibility(module, argc, argv, visi); + + set_method_visibility(module, argc, argv, visi); + if (argc == 1) { + return argv[0]; } - return module; + return rb_ary_new_from_values(argc, argv); } /* * call-seq: - * public -> self - * public(symbol, ...) -> self - * public(string, ...) -> self - * public(array) -> self + * public -> nil + * public(method_name) -> method_name + * public(method_name, method_name, ...) -> array + * public(array) -> array * * With no arguments, sets the default visibility for subsequently * defined methods to public. With arguments, sets the named methods to * have public visibility. * String arguments are converted to symbols. * An Array of Symbols and/or Strings is also accepted. + * If a single argument is passed, it is returned. + * If no argument is passed, nil is returned. + * If multiple arguments are passed, the arguments are returned as an array. */ static VALUE @@ -2101,16 +2443,19 @@ rb_mod_public(int argc, VALUE *argv, VALUE module) /* * call-seq: - * protected -> self - * protected(symbol, ...) -> self - * protected(string, ...) -> self - * protected(array) -> self + * protected -> nil + * protected(method_name) -> method_name + * protected(method_name, method_name, ...) -> array + * protected(array) -> array * * With no arguments, sets the default visibility for subsequently * defined methods to protected. With arguments, sets the named methods * to have protected visibility. * String arguments are converted to symbols. * An Array of Symbols and/or Strings is also accepted. + * If a single argument is passed, it is returned. + * If no argument is passed, nil is returned. + * If multiple arguments are passed, the arguments are returned as an array. * * If a method has protected visibility, it is callable only where * <code>self</code> of the context is the same as the method. @@ -2130,16 +2475,19 @@ rb_mod_protected(int argc, VALUE *argv, VALUE module) /* * call-seq: - * private -> self - * private(symbol, ...) -> self - * private(string, ...) -> self - * private(array) -> self + * private -> nil + * private(method_name) -> method_name + * private(method_name, method_name, ...) -> array + * private(array) -> array * * With no arguments, sets the default visibility for subsequently * defined methods to private. With arguments, sets the named methods * to have private visibility. * String arguments are converted to symbols. * An Array of Symbols and/or Strings is also accepted. + * If a single argument is passed, it is returned. + * If no argument is passed, nil is returned. + * If multiple arguments are passed, the arguments are returned as an array. * * module Mod * def a() end @@ -2227,10 +2575,10 @@ rb_mod_ruby2_keywords(int argc, VALUE *argv, VALUE module) if (module == defined_class || origin_class == defined_class) { switch (me->def->type) { case VM_METHOD_TYPE_ISEQ: - if (me->def->body.iseq.iseqptr->body->param.flags.has_rest && - !me->def->body.iseq.iseqptr->body->param.flags.has_kw && - !me->def->body.iseq.iseqptr->body->param.flags.has_kwrest) { - me->def->body.iseq.iseqptr->body->param.flags.ruby2_keywords = 1; + if (ISEQ_BODY(me->def->body.iseq.iseqptr)->param.flags.has_rest && + !ISEQ_BODY(me->def->body.iseq.iseqptr)->param.flags.has_kw && + !ISEQ_BODY(me->def->body.iseq.iseqptr)->param.flags.has_kwrest) { + ISEQ_BODY(me->def->body.iseq.iseqptr)->param.flags.ruby2_keywords = 1; rb_clear_method_cache(module, name); } else { @@ -2246,10 +2594,10 @@ rb_mod_ruby2_keywords(int argc, VALUE *argv, VALUE module) if (vm_block_handler_type(procval) == block_handler_type_iseq) { const struct rb_captured_block *captured = VM_BH_TO_ISEQ_BLOCK(procval); const rb_iseq_t *iseq = rb_iseq_check(captured->code.iseq); - if (iseq->body->param.flags.has_rest && - !iseq->body->param.flags.has_kw && - !iseq->body->param.flags.has_kwrest) { - iseq->body->param.flags.ruby2_keywords = 1; + if (ISEQ_BODY(iseq)->param.flags.has_rest && + !ISEQ_BODY(iseq)->param.flags.has_kw && + !ISEQ_BODY(iseq)->param.flags.has_kwrest) { + ISEQ_BODY(iseq)->param.flags.ruby2_keywords = 1; rb_clear_method_cache(module, name); } else { @@ -2336,7 +2684,7 @@ rb_mod_private_method(int argc, VALUE *argv, VALUE obj) static VALUE top_public(int argc, VALUE *argv, VALUE _) { - return rb_mod_public(argc, argv, rb_cObject); + return rb_mod_public(argc, argv, rb_top_main_class("public")); } /* @@ -2356,7 +2704,7 @@ top_public(int argc, VALUE *argv, VALUE _) static VALUE top_private(int argc, VALUE *argv, VALUE _) { - return rb_mod_private(argc, argv, rb_cObject); + return rb_mod_private(argc, argv, rb_top_main_class("private")); } /* @@ -2369,13 +2717,14 @@ top_private(int argc, VALUE *argv, VALUE _) static VALUE top_ruby2_keywords(int argc, VALUE *argv, VALUE module) { - return rb_mod_ruby2_keywords(argc, argv, rb_cObject); + return rb_mod_ruby2_keywords(argc, argv, rb_top_main_class("ruby2_keywords")); } /* * call-seq: - * module_function(symbol, ...) -> self - * module_function(string, ...) -> self + * module_function -> nil + * module_function(method_name) -> method_name + * module_function(method_name, method_name, ...) -> array * * Creates module functions for the named methods. These functions may * be called with the module as a receiver, and also become available @@ -2385,6 +2734,9 @@ top_ruby2_keywords(int argc, VALUE *argv, VALUE module) * used with no arguments, subsequently defined methods become module * functions. * String arguments are converted to symbols. + * If a single argument is passed, it is returned. + * If no argument is passed, nil is returned. + * If multiple arguments are passed, the arguments are returned as an array. * * module Mod * def one @@ -2418,38 +2770,41 @@ rb_mod_modfunc(int argc, VALUE *argv, VALUE module) const rb_method_entry_t *me; if (!RB_TYPE_P(module, T_MODULE)) { - rb_raise(rb_eTypeError, "module_function must be called for modules"); + rb_raise(rb_eTypeError, "module_function must be called for modules"); } if (argc == 0) { - rb_scope_module_func_set(); - return module; + rb_scope_module_func_set(); + return Qnil; } set_method_visibility(module, argc, argv, METHOD_VISI_PRIVATE); for (i = 0; i < argc; i++) { - VALUE m = module; - - id = rb_to_id(argv[i]); - for (;;) { - me = search_method(m, id, 0); - if (me == 0) { - me = search_method(rb_cObject, id, 0); - } - if (UNDEFINED_METHOD_ENTRY_P(me)) { - rb_print_undef(module, id, METHOD_VISI_UNDEF); - } - if (me->def->type != VM_METHOD_TYPE_ZSUPER) { - break; /* normal case: need not to follow 'super' link */ - } - m = RCLASS_SUPER(m); - if (!m) - break; - } - rb_method_entry_set(rb_singleton_class(module), id, me, METHOD_VISI_PUBLIC); - } - return module; + VALUE m = module; + + id = rb_to_id(argv[i]); + for (;;) { + me = search_method(m, id, 0); + if (me == 0) { + me = search_method(rb_cObject, id, 0); + } + if (UNDEFINED_METHOD_ENTRY_P(me)) { + rb_print_undef(module, id, METHOD_VISI_UNDEF); + } + if (me->def->type != VM_METHOD_TYPE_ZSUPER) { + break; /* normal case: need not to follow 'super' link */ + } + m = RCLASS_SUPER(m); + if (!m) + break; + } + rb_method_entry_set(rb_singleton_class(module), id, me, METHOD_VISI_PUBLIC); + } + if (argc == 1) { + return argv[0]; + } + return rb_ary_new_from_values(argc, argv); } #ifdef __GNUC__ @@ -2480,7 +2835,7 @@ call_method_entry(rb_execution_context_t *ec, VALUE defined_class, VALUE obj, ID static VALUE basic_obj_respond_to_missing(rb_execution_context_t *ec, VALUE klass, VALUE obj, - VALUE mid, VALUE priv) + VALUE mid, VALUE priv) { VALUE defined_class, args[2]; const ID rtmid = idRespond_to_missing; @@ -2500,13 +2855,13 @@ basic_obj_respond_to(rb_execution_context_t *ec, VALUE obj, ID id, int pub) switch (method_boundp(klass, id, pub|BOUND_RESPONDS)) { case 2: - return FALSE; + return FALSE; case 0: - ret = basic_obj_respond_to_missing(ec, klass, obj, ID2SYM(id), - pub ? Qfalse : Qtrue); - return RTEST(ret) && ret != Qundef; + ret = basic_obj_respond_to_missing(ec, klass, obj, ID2SYM(id), + RBOOL(!pub)); + return RTEST(ret) && !UNDEF_P(ret); default: - return TRUE; + return TRUE; } } @@ -2519,46 +2874,46 @@ vm_respond_to(rb_execution_context_t *ec, VALUE klass, VALUE obj, ID id, int pri if (!cme) return -1; if (METHOD_ENTRY_BASIC(cme)) { - return -1; + return -1; } else { - int argc = 1; - VALUE args[2]; - VALUE result; + int argc = 1; + VALUE args[2]; + VALUE result; - args[0] = ID2SYM(id); - args[1] = Qtrue; - if (priv) { + args[0] = ID2SYM(id); + args[1] = Qtrue; + if (priv) { argc = rb_method_entry_arity((const rb_method_entry_t *)cme); - if (argc > 2) { - rb_raise(rb_eArgError, - "respond_to? must accept 1 or 2 arguments (requires %d)", - argc); - } - if (argc != 1) { - argc = 2; - } - else if (!NIL_P(ruby_verbose)) { - VALUE location = rb_method_entry_location((const rb_method_entry_t *)cme); + if (argc > 2) { + rb_raise(rb_eArgError, + "respond_to? must accept 1 or 2 arguments (requires %d)", + argc); + } + if (argc != 1) { + argc = 2; + } + else if (!NIL_P(ruby_verbose)) { + VALUE location = rb_method_entry_location((const rb_method_entry_t *)cme); rb_category_warn(RB_WARN_CATEGORY_DEPRECATED, "%"PRIsVALUE"%c""respond_to?(:%"PRIsVALUE") uses" - " the deprecated method signature, which takes one parameter", - (FL_TEST(klass, FL_SINGLETON) ? obj : klass), - (FL_TEST(klass, FL_SINGLETON) ? '.' : '#'), - QUOTE_ID(id)); - if (!NIL_P(location)) { - VALUE path = RARRAY_AREF(location, 0); - VALUE line = RARRAY_AREF(location, 1); - if (!NIL_P(path)) { - rb_category_compile_warn(RB_WARN_CATEGORY_DEPRECATED, - RSTRING_PTR(path), NUM2INT(line), - "respond_to? is defined here"); - } - } - } - } + " the deprecated method signature, which takes one parameter", + (RCLASS_SINGLETON_P(klass) ? obj : klass), + (RCLASS_SINGLETON_P(klass) ? '.' : '#'), + QUOTE_ID(id)); + if (!NIL_P(location)) { + VALUE path = RARRAY_AREF(location, 0); + VALUE line = RARRAY_AREF(location, 1); + if (!NIL_P(path)) { + rb_category_compile_warn(RB_WARN_CATEGORY_DEPRECATED, + RSTRING_PTR(path), NUM2INT(line), + "respond_to? is defined here"); + } + } + } + } result = call_method_entry(ec, defined_class, obj, resid, cme, argc, args, RB_NO_KEYWORDS); - return RTEST(result); + return RTEST(result); } } @@ -2614,10 +2969,10 @@ obj_respond_to(int argc, VALUE *argv, VALUE obj) rb_scan_args(argc, argv, "11", &mid, &priv); if (!(id = rb_check_id(&mid))) { - VALUE ret = basic_obj_respond_to_missing(ec, CLASS_OF(obj), obj, - rb_to_symbol(mid), priv); - if (ret == Qundef) ret = Qfalse; - return ret; + VALUE ret = basic_obj_respond_to_missing(ec, CLASS_OF(obj), obj, + rb_to_symbol(mid), priv); + if (UNDEF_P(ret)) ret = Qfalse; + return ret; } return RBOOL(basic_obj_respond_to(ec, obj, id, !RTEST(priv))); } @@ -2644,12 +2999,6 @@ obj_respond_to_missing(VALUE obj, VALUE mid, VALUE priv) } void -Init_Method(void) -{ - // -} - -void Init_eval_method(void) { rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1); @@ -2672,20 +3021,20 @@ Init_eval_method(void) rb_define_method(rb_cModule, "private_class_method", rb_mod_private_method, -1); rb_define_private_method(rb_singleton_class(rb_vm_top_self()), - "public", top_public, -1); + "public", top_public, -1); rb_define_private_method(rb_singleton_class(rb_vm_top_self()), - "private", top_private, -1); + "private", top_private, -1); rb_define_private_method(rb_singleton_class(rb_vm_top_self()), - "ruby2_keywords", top_ruby2_keywords, -1); + "ruby2_keywords", top_ruby2_keywords, -1); { #define REPLICATE_METHOD(klass, id) do { \ - const rb_method_entry_t *me = rb_method_entry((klass), (id)); \ - rb_method_entry_set((klass), (id), me, METHOD_ENTRY_VISI(me)); \ - } while (0) + const rb_method_entry_t *me = rb_method_entry((klass), (id)); \ + rb_method_entry_set((klass), (id), me, METHOD_ENTRY_VISI(me)); \ + } while (0) - REPLICATE_METHOD(rb_eException, idMethodMissing); - REPLICATE_METHOD(rb_eException, idRespond_to); - REPLICATE_METHOD(rb_eException, idRespond_to_missing); + REPLICATE_METHOD(rb_eException, idMethodMissing); + REPLICATE_METHOD(rb_eException, idRespond_to); + REPLICATE_METHOD(rb_eException, idRespond_to_missing); } } |