mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
60d6038dda
entry with VM_METHOD_TYPE_REFINED holds only the original method definition, so ci->me is set to a method entry allocated in the stack, and it causes SEGV/ILL. In this commit, a method entry with VM_METHOD_TYPE_REFINED holds the whole original method entry. Furthermore, rb_thread_mark() is changed to mark cfp->klass to avoid GC for iclasses created by copy_refinement_iclass(). * vm_method.c (rb_method_entry_make): add a method entry with VM_METHOD_TYPE_REFINED to the class refined by the refinement if the target module is a refinement. When a method entry with VM_METHOD_TYPE_UNDEF is invoked by vm_call_method(), a method with the same name is searched in refinements. If such a method is found, the method is invoked. Otherwise, the original method in the refined class (rb_method_definition_t::body.orig_me) is invoked. This change is made to simplify the normal method lookup and to improve the performance of normal method calls. * vm_method.c (EXPR1, search_method, rb_method_entry), vm_eval.c (rb_call0, rb_search_method_entry): do not use refinements for method lookup. * vm_insnhelper.c (vm_call_method): search methods in refinements if ci->me is VM_METHOD_TYPE_REFINED. If the method is called by super (i.e., ci->call == vm_call_super_method), skip the same method entry as the current method to avoid infinite call of the same method. * class.c (include_modules_at): add a refined method entry for each method defined in a module included in a refinement. * class.c (rb_prepend_module): set an empty table to RCLASS_M_TBL(klass) to add refined method entries, because refinements should have priority over prepended modules. * proc.c (mnew): use rb_method_entry_with_refinements() to get a refined method. * vm.c (rb_thread_mark): mark cfp->klass for iclasses created by copy_refinement_iclass(). * vm.c (Init_VM), cont.c (fiber_init): initialize th->cfp->klass. * test/ruby/test_refinement.rb (test_inline_method_cache): do not skip the test because it should pass successfully. * test/ruby/test_refinement.rb (test_redefine_refined_method): new test for the case a refined method is redefined. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
118 lines
3.7 KiB
C
118 lines
3.7 KiB
C
/**********************************************************************
|
|
|
|
method.h -
|
|
|
|
$Author$
|
|
created at: Wed Jul 15 20:02:33 2009
|
|
|
|
Copyright (C) 2009 Koichi Sasada
|
|
|
|
**********************************************************************/
|
|
#ifndef METHOD_H
|
|
#define METHOD_H
|
|
|
|
typedef enum {
|
|
NOEX_PUBLIC = 0x00,
|
|
NOEX_NOSUPER = 0x01,
|
|
NOEX_PRIVATE = 0x02,
|
|
NOEX_PROTECTED = 0x04,
|
|
NOEX_MASK = 0x06,
|
|
NOEX_BASIC = 0x08,
|
|
NOEX_UNDEF = NOEX_NOSUPER,
|
|
NOEX_MODFUNC = 0x12,
|
|
NOEX_SUPER = 0x20,
|
|
NOEX_VCALL = 0x40,
|
|
NOEX_RESPONDS = 0x80
|
|
} rb_method_flag_t;
|
|
|
|
#define NOEX_SAFE(n) ((int)((n) >> 8) & 0x0F)
|
|
#define NOEX_WITH(n, s) (((s) << 8) | (n) | (ruby_running ? 0 : NOEX_BASIC))
|
|
#define NOEX_WITH_SAFE(n) NOEX_WITH((n), rb_safe_level())
|
|
|
|
/* method data type */
|
|
|
|
typedef enum {
|
|
VM_METHOD_TYPE_ISEQ,
|
|
VM_METHOD_TYPE_CFUNC,
|
|
VM_METHOD_TYPE_ATTRSET,
|
|
VM_METHOD_TYPE_IVAR,
|
|
VM_METHOD_TYPE_BMETHOD,
|
|
VM_METHOD_TYPE_ZSUPER,
|
|
VM_METHOD_TYPE_UNDEF,
|
|
VM_METHOD_TYPE_NOTIMPLEMENTED,
|
|
VM_METHOD_TYPE_OPTIMIZED, /* Kernel#send, Proc#call, etc */
|
|
VM_METHOD_TYPE_MISSING, /* wrapper for method_missing(id) */
|
|
VM_METHOD_TYPE_CFUNC_FRAMELESS,
|
|
VM_METHOD_TYPE_REFINED,
|
|
} rb_method_type_t;
|
|
|
|
struct rb_call_info_struct;
|
|
|
|
typedef struct rb_method_cfunc_struct {
|
|
VALUE (*func)(ANYARGS);
|
|
VALUE (*invoker)(VALUE (*func)(ANYARGS), VALUE recv, int argc, const VALUE *argv);
|
|
int argc;
|
|
} rb_method_cfunc_t;
|
|
|
|
typedef struct rb_method_attr_struct {
|
|
ID id;
|
|
VALUE location;
|
|
} rb_method_attr_t;
|
|
|
|
typedef struct rb_iseq_struct rb_iseq_t;
|
|
|
|
typedef struct rb_method_definition_struct {
|
|
rb_method_type_t type; /* method type */
|
|
ID original_id;
|
|
union {
|
|
rb_iseq_t *iseq; /* should be mark */
|
|
rb_method_cfunc_t cfunc;
|
|
rb_method_attr_t attr;
|
|
VALUE proc; /* should be mark */
|
|
enum method_optimized_type {
|
|
OPTIMIZED_METHOD_TYPE_SEND,
|
|
OPTIMIZED_METHOD_TYPE_CALL
|
|
} optimize_type;
|
|
struct rb_method_entry_struct *orig_me;
|
|
} body;
|
|
int alias_count;
|
|
} rb_method_definition_t;
|
|
|
|
typedef struct rb_method_entry_struct {
|
|
rb_method_flag_t flag;
|
|
char mark;
|
|
rb_method_definition_t *def;
|
|
ID called_id;
|
|
VALUE klass; /* should be mark */
|
|
} rb_method_entry_t;
|
|
|
|
struct unlinked_method_entry_list_entry {
|
|
struct unlinked_method_entry_list_entry *next;
|
|
rb_method_entry_t *me;
|
|
};
|
|
|
|
#define UNDEFINED_METHOD_ENTRY_P(me) (!(me) || !(me)->def || (me)->def->type == VM_METHOD_TYPE_UNDEF)
|
|
|
|
void rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_flag_t noex);
|
|
rb_method_entry_t *rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *option, rb_method_flag_t noex);
|
|
rb_method_entry_t *rb_method_entry(VALUE klass, ID id, VALUE *define_class_ptr);
|
|
void rb_add_refined_method_entry(VALUE refined_class, ID mid);
|
|
rb_method_entry_t *rb_resolve_refined_method(VALUE refinements,
|
|
rb_method_entry_t *me,
|
|
VALUE *defined_class_ptr);
|
|
rb_method_entry_t *rb_method_entry_with_refinements(VALUE klass, ID id,
|
|
VALUE *defined_class_ptr);
|
|
|
|
rb_method_entry_t *rb_method_entry_get_without_cache(VALUE klass, ID id, VALUE *define_class_ptr);
|
|
rb_method_entry_t *rb_method_entry_set(VALUE klass, ID mid, const rb_method_entry_t *, rb_method_flag_t noex);
|
|
|
|
int rb_method_entry_arity(const rb_method_entry_t *me);
|
|
int rb_method_entry_eq(const rb_method_entry_t *m1, const rb_method_entry_t *m2);
|
|
st_index_t rb_hash_method_entry(st_index_t hash, const rb_method_entry_t *me);
|
|
|
|
void rb_mark_method_entry(const rb_method_entry_t *me);
|
|
void rb_free_method_entry(rb_method_entry_t *me);
|
|
void rb_sweep_method_entry(void *vm);
|
|
void rb_free_m_table(st_table *tbl);
|
|
|
|
#endif /* METHOD_H */
|