2009-07-16 04:37:25 +04:00
|
|
|
/**********************************************************************
|
|
|
|
|
|
|
|
method.h -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Wed Jul 15 20:02:33 2009
|
|
|
|
|
|
|
|
Copyright (C) 2009 Koichi Sasada
|
|
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
#ifndef METHOD_H
|
|
|
|
#define METHOD_H
|
|
|
|
|
* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
variable.c, vm.c, vm_core.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: Implement class hierarchy method cache invalidation.
[ruby-core:55053] [Feature #8426] [GH-387]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-04 09:25:06 +04:00
|
|
|
#include "internal.h"
|
|
|
|
|
2012-12-13 07:50:19 +04:00
|
|
|
#ifndef END_OF_ENUMERATION
|
2013-10-22 16:59:27 +04:00
|
|
|
# if defined(__GNUC__) &&! defined(__STRICT_ANSI__)
|
2012-12-13 07:50:19 +04:00
|
|
|
# define END_OF_ENUMERATION(key)
|
|
|
|
# else
|
|
|
|
# define END_OF_ENUMERATION(key) END_OF_##key##_PLACEHOLDER = 0
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
2015-06-05 14:42:34 +03:00
|
|
|
/* cref */
|
|
|
|
|
|
|
|
typedef enum {
|
|
|
|
METHOD_VISI_UNDEF = 0x00,
|
|
|
|
METHOD_VISI_PUBLIC = 0x01,
|
|
|
|
METHOD_VISI_PRIVATE = 0x02,
|
|
|
|
METHOD_VISI_PROTECTED = 0x03
|
|
|
|
} rb_method_visibility_t;
|
|
|
|
|
|
|
|
typedef struct rb_scope_visi_struct {
|
|
|
|
rb_method_visibility_t method_visi : 3;
|
|
|
|
unsigned int module_func : 1;
|
|
|
|
} rb_scope_visibility_t;
|
|
|
|
|
|
|
|
typedef struct rb_cref_struct {
|
|
|
|
VALUE flags;
|
|
|
|
const VALUE refinements;
|
|
|
|
const VALUE klass;
|
|
|
|
struct rb_cref_struct * const next;
|
|
|
|
rb_scope_visibility_t scope_visi;
|
|
|
|
} rb_cref_t;
|
|
|
|
|
2009-07-16 04:37:25 +04:00
|
|
|
/* method data type */
|
|
|
|
|
2015-06-02 07:20:30 +03:00
|
|
|
typedef struct rb_method_entry_struct {
|
|
|
|
VALUE flags;
|
2015-06-11 02:55:33 +03:00
|
|
|
VALUE dummy;
|
2015-06-02 07:20:30 +03:00
|
|
|
struct rb_method_definition_struct * const def;
|
|
|
|
ID called_id;
|
|
|
|
const VALUE klass; /* should be marked */
|
|
|
|
} rb_method_entry_t;
|
|
|
|
|
2015-06-11 02:55:33 +03:00
|
|
|
#define METHOD_ENTRY_VISI(me) (rb_method_visibility_t)(((me)->flags & (IMEMO_FL_USER0 | IMEMO_FL_USER1)) >> (IMEMO_FL_USHIFT+0))
|
|
|
|
#define METHOD_ENTRY_BASIC(me) (int) (((me)->flags & (IMEMO_FL_USER2 )) >> (IMEMO_FL_USHIFT+2))
|
|
|
|
#define METHOD_ENTRY_SAFE(me) (int) (((me)->flags & (IMEMO_FL_USER3 | IMEMO_FL_USER4)) >> (IMEMO_FL_USHIFT+3))
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
METHOD_ENTRY_VISI_SET(rb_method_entry_t *me, rb_method_visibility_t visi)
|
|
|
|
{
|
|
|
|
VM_ASSERT(visi <= 3);
|
|
|
|
me->flags = (me->flags & ~(IMEMO_FL_USER0 | IMEMO_FL_USER1)) | (visi << IMEMO_FL_USHIFT+0);
|
|
|
|
}
|
|
|
|
static inline void
|
|
|
|
METHOD_ENTRY_BASIC_SET(rb_method_entry_t *me, int basic)
|
|
|
|
{
|
|
|
|
VM_ASSERT(basic <= 1);
|
2015-06-11 10:25:38 +03:00
|
|
|
me->flags = (me->flags & ~(IMEMO_FL_USER2 )) | (basic << IMEMO_FL_USHIFT+2);
|
2015-06-11 02:55:33 +03:00
|
|
|
}
|
|
|
|
static inline void
|
|
|
|
METHOD_ENTRY_SAFE_SET(rb_method_entry_t *me, int safe)
|
|
|
|
{
|
|
|
|
VM_ASSERT(safe <= 3);
|
|
|
|
me->flags = (me->flags & ~(IMEMO_FL_USER3 | IMEMO_FL_USER4)) | (safe << IMEMO_FL_USHIFT+3);
|
|
|
|
}
|
|
|
|
static inline void
|
|
|
|
METHOD_ENTRY_FLAGS_SET(rb_method_entry_t *me, rb_method_visibility_t visi, int basic, int safe)
|
|
|
|
{
|
|
|
|
VM_ASSERT(visi <= 3);
|
|
|
|
VM_ASSERT(basic <= 1);
|
|
|
|
VM_ASSERT(safe <= 3);
|
|
|
|
me->flags =
|
|
|
|
(me->flags & ~(IMEMO_FL_USER0|IMEMO_FL_USER1|IMEMO_FL_USER2|IMEMO_FL_USER3|IMEMO_FL_USER4)) |
|
|
|
|
((visi << IMEMO_FL_USHIFT+0) | (basic << (IMEMO_FL_USHIFT+2)) | (safe << IMEMO_FL_USHIFT+3));
|
|
|
|
}
|
2015-06-06 13:19:48 +03:00
|
|
|
|
2009-07-16 04:37:25 +04:00
|
|
|
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,
|
2015-05-30 21:45:28 +03:00
|
|
|
VM_METHOD_TYPE_ALIAS,
|
2009-07-16 04:37:25 +04:00
|
|
|
VM_METHOD_TYPE_UNDEF,
|
|
|
|
VM_METHOD_TYPE_NOTIMPLEMENTED,
|
2009-09-28 07:09:16 +04:00
|
|
|
VM_METHOD_TYPE_OPTIMIZED, /* Kernel#send, Proc#call, etc */
|
2012-10-16 01:24:08 +04:00
|
|
|
VM_METHOD_TYPE_MISSING, /* wrapper for method_missing(id) */
|
2012-12-13 07:50:19 +04:00
|
|
|
VM_METHOD_TYPE_REFINED,
|
|
|
|
|
|
|
|
END_OF_ENUMERATION(VM_METHOD_TYPE)
|
2009-07-16 04:37:25 +04:00
|
|
|
} rb_method_type_t;
|
|
|
|
|
2015-06-02 07:20:30 +03:00
|
|
|
typedef struct rb_iseq_struct rb_iseq_t;
|
|
|
|
|
|
|
|
typedef struct rb_method_iseq_struct {
|
|
|
|
rb_iseq_t * const iseqptr; /* should be separated from iseqval */
|
|
|
|
rb_cref_t * const cref; /* shoudl be marked */
|
2015-06-04 19:08:40 +03:00
|
|
|
} rb_method_iseq_t; /* check rb_add_method_iseq() when modify the fields */
|
2015-06-02 07:20:30 +03:00
|
|
|
|
2009-07-16 04:37:25 +04:00
|
|
|
typedef struct rb_method_cfunc_struct {
|
|
|
|
VALUE (*func)(ANYARGS);
|
2012-11-13 13:48:08 +04:00
|
|
|
VALUE (*invoker)(VALUE (*func)(ANYARGS), VALUE recv, int argc, const VALUE *argv);
|
2009-07-16 04:37:25 +04:00
|
|
|
int argc;
|
|
|
|
} rb_method_cfunc_t;
|
|
|
|
|
2010-03-22 14:44:01 +03:00
|
|
|
typedef struct rb_method_attr_struct {
|
|
|
|
ID id;
|
2015-06-02 07:20:30 +03:00
|
|
|
const VALUE location; /* sould be marked */
|
2010-03-22 14:44:01 +03:00
|
|
|
} rb_method_attr_t;
|
|
|
|
|
2015-05-30 21:45:28 +03:00
|
|
|
typedef struct rb_method_alias_struct {
|
2015-06-18 11:01:13 +03:00
|
|
|
const struct rb_method_entry_struct * const original_me; /* original_me->klass is original owner */
|
2015-05-30 21:45:28 +03:00
|
|
|
} rb_method_alias_t;
|
|
|
|
|
2015-06-04 01:27:51 +03:00
|
|
|
typedef struct rb_method_refined_struct {
|
2015-06-18 11:01:13 +03:00
|
|
|
const struct rb_method_entry_struct * const orig_me;
|
2015-06-04 01:27:51 +03:00
|
|
|
} rb_method_refined_t;
|
|
|
|
|
2009-08-28 06:45:41 +04:00
|
|
|
typedef struct rb_method_definition_struct {
|
2009-07-16 04:37:25 +04:00
|
|
|
rb_method_type_t type; /* method type */
|
2015-06-06 13:19:48 +03:00
|
|
|
int alias_count;
|
* fix namespace issue on singleton class expressions. [Bug #10943]
* vm_core.h, method.h: remove rb_iseq_t::cref_stack. CREF is stored
to rb_method_definition_t::body.iseq_body.cref.
* vm_insnhelper.c: modify SVAR usage.
When calling ISEQ type method, push CREF information onto method
frame, SVAR located place. Before this fix, SVAR is simply nil.
After this patch, CREF (or NULL == Qfalse for not iseq methods)
is stored at the method invocation.
When SVAR is requierd, then put NODE_IF onto SVAR location,
and NDOE_IF::nd_reserved points CREF itself.
* vm.c (vm_cref_new, vm_cref_dump, vm_cref_new_toplevel): added.
* vm_insnhelper.c (vm_push_frame): accept CREF.
* method.h, vm_method.c (rb_add_method_iseq): added. This function
accepts iseq and CREF.
* class.c (clone_method): use rb_add_method_iseq().
* gc.c (mark_method_entry): mark method_entry::body.iseq_body.cref.
* iseq.c: remove CREF related codes.
* insns.def (getinlinecache/setinlinecache): CREF should be cache key
because a different CREF has a different namespace.
* node.c (rb_gc_mark_node): mark NODE_IF::nd_reserved for SVAR.
* proc.c: catch up changes.
* struct.c: ditto.
* insns.def: ditto.
* vm_args.c (raise_argument_error): ditto.
* vm_eval.c: ditto.
* test/ruby/test_class.rb: add a test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-06 15:24:58 +03:00
|
|
|
|
2009-07-16 04:37:25 +04:00
|
|
|
union {
|
2015-06-02 07:20:30 +03:00
|
|
|
rb_method_iseq_t iseq;
|
2009-07-16 04:37:25 +04:00
|
|
|
rb_method_cfunc_t cfunc;
|
2010-03-22 14:44:01 +03:00
|
|
|
rb_method_attr_t attr;
|
2015-05-30 21:45:28 +03:00
|
|
|
rb_method_alias_t alias;
|
2015-06-04 01:27:51 +03:00
|
|
|
rb_method_refined_t refined;
|
|
|
|
|
2015-05-30 22:18:40 +03:00
|
|
|
const VALUE proc; /* should be marked */
|
2009-07-16 04:37:25 +04:00
|
|
|
enum method_optimized_type {
|
|
|
|
OPTIMIZED_METHOD_TYPE_SEND,
|
2012-12-12 11:07:25 +04:00
|
|
|
OPTIMIZED_METHOD_TYPE_CALL,
|
|
|
|
|
|
|
|
OPTIMIZED_METHOD_TYPE__MAX
|
2009-07-16 04:37:25 +04:00
|
|
|
} optimize_type;
|
|
|
|
} body;
|
2015-06-03 04:39:16 +03:00
|
|
|
|
|
|
|
ID original_id;
|
2009-08-28 06:45:41 +04:00
|
|
|
} rb_method_definition_t;
|
|
|
|
|
|
|
|
#define UNDEFINED_METHOD_ENTRY_P(me) (!(me) || !(me)->def || (me)->def->type == VM_METHOD_TYPE_UNDEF)
|
2015-01-12 11:18:10 +03:00
|
|
|
#define UNDEFINED_REFINED_METHOD_P(def) \
|
|
|
|
((def)->type == VM_METHOD_TYPE_REFINED && \
|
2015-06-04 01:27:51 +03:00
|
|
|
UNDEFINED_METHOD_ENTRY_P((def)->body.refined.orig_me))
|
2009-08-28 06:45:41 +04:00
|
|
|
|
2015-06-03 04:39:16 +03:00
|
|
|
void rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_method_visibility_t visi);
|
|
|
|
void rb_add_method_iseq(VALUE klass, ID mid, VALUE iseqval, rb_cref_t *cref, rb_method_visibility_t visi);
|
|
|
|
rb_method_entry_t *rb_add_method(VALUE klass, ID mid, rb_method_type_t type, void *option, rb_method_visibility_t visi);
|
2012-08-02 15:08:44 +04:00
|
|
|
rb_method_entry_t *rb_method_entry(VALUE klass, ID id, VALUE *define_class_ptr);
|
2013-05-13 09:51:14 +04:00
|
|
|
rb_method_entry_t *rb_method_entry_at(VALUE obj, ID id);
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
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
2012-12-06 17:08:41 +04:00
|
|
|
void rb_add_refined_method_entry(VALUE refined_class, ID mid);
|
2015-06-04 19:02:01 +03:00
|
|
|
const rb_method_entry_t *rb_resolve_refined_method(VALUE refinements,
|
|
|
|
const rb_method_entry_t *me,
|
|
|
|
VALUE *defined_class_ptr);
|
|
|
|
const rb_method_entry_t *rb_method_entry_with_refinements(VALUE klass, ID id,
|
|
|
|
VALUE *defined_class_ptr);
|
|
|
|
const rb_method_entry_t *rb_method_entry_without_refinements(VALUE klass, ID id,
|
|
|
|
VALUE *defined_class_ptr);
|
* revised r37993 to avoid SEGV/ILL in tests. In r37993, a method
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
2012-12-06 17:08:41 +04:00
|
|
|
|
2013-09-24 09:02:13 +04:00
|
|
|
rb_method_entry_t *rb_method_entry_get_without_cache(VALUE klass, ID id, VALUE *define_class_ptr);
|
2015-06-03 04:39:16 +03:00
|
|
|
rb_method_entry_t *rb_method_entry_set(VALUE klass, ID mid, const rb_method_entry_t *, rb_method_visibility_t noex);
|
2010-05-05 00:25:09 +04:00
|
|
|
|
2009-07-16 04:37:25 +04:00
|
|
|
int rb_method_entry_arity(const rb_method_entry_t *me);
|
* method.h, internal.h iseq.h: declare internal functions.
* compile.c, eval.c, iseq.c, object.c, parse.y, proc.c, process.c,
thread.c, vm.c, vm_eval.c, vm_insnhelper.c, vm_method.c: don't
declare internal functions.
Note that rb_method_entry_eq() is defined in vm_method.c but
there was a declaration in proc.c with different const-ness.
Now it is declared in method.h with same const-ness to the
definition.
* object.c (rb_mod_module_exec): don't declare functions declared in
include/ruby/intern.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-18 07:49:33 +04:00
|
|
|
int rb_method_entry_eq(const rb_method_entry_t *m1, const rb_method_entry_t *m2);
|
2012-02-21 04:13:44 +04:00
|
|
|
st_index_t rb_hash_method_entry(st_index_t hash, const rb_method_entry_t *me);
|
2010-05-05 00:25:09 +04:00
|
|
|
|
2015-05-21 12:01:44 +03:00
|
|
|
VALUE rb_method_entry_location(const rb_method_entry_t *me);
|
2013-02-06 08:35:23 +04:00
|
|
|
VALUE rb_mod_method_location(VALUE mod, ID id);
|
|
|
|
VALUE rb_obj_method_location(VALUE obj, ID id);
|
|
|
|
|
2015-05-30 21:30:42 +03:00
|
|
|
void rb_free_method_entry(const rb_method_entry_t *me);
|
2010-05-05 21:51:21 +04:00
|
|
|
void rb_sweep_method_entry(void *vm);
|
2009-07-16 04:37:25 +04:00
|
|
|
|
2015-06-06 13:19:48 +03:00
|
|
|
rb_method_entry_t *rb_method_entry_create(ID called_id, VALUE klass, rb_method_visibility_t visi, rb_method_definition_t *def);
|
2015-06-02 07:20:30 +03:00
|
|
|
rb_method_entry_t *rb_method_entry_clone(const rb_method_entry_t *me);
|
2015-06-04 19:02:01 +03:00
|
|
|
void rb_method_entry_copy(rb_method_entry_t *dst, const rb_method_entry_t *src);
|
2015-06-02 07:20:30 +03:00
|
|
|
|
2015-06-03 17:07:24 +03:00
|
|
|
void rb_scope_visibility_set(rb_method_visibility_t);
|
|
|
|
|
2009-07-16 04:37:25 +04:00
|
|
|
#endif /* METHOD_H */
|