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

merge revision(s) 58245,60127: [Backport #13973]

Browse source 
Refactored using Method#owner.


	proc.c: super_method of included method

	* proc.c (method_super_method): search the next super method along
	  the included ancestor chain.  [ruby-core:83114] [Bug #13973]

	* vm_method.c (rb_callable_method_entry_without_refinements):
	  return the defined class.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-03-20 15:53:38 +00:00
parent ab2e7357bd
commit 9e7b578418
8 changed files with 58 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pp.rb
View file

@ -311,7 +311,7 @@ class PP < PrettyPrint
inspect_method = method_method.call(:inspect) inspect_method = method_method.call(:inspect)
rescue NameError rescue NameError
end end
if inspect_method && /\(Kernel\)#/ !~ inspect_method.inspect if inspect_method && inspect_method.owner != Kernel
q.text self.inspect q.text self.inspect
elsif !inspect_method && self.respond_to?(:inspect) elsif !inspect_method && self.respond_to?(:inspect)
q.text self.inspect q.text self.inspect
@ -345,7 +345,7 @@ class PP < PrettyPrint
# However, doing this requires that every class that #inspect is called on # However, doing this requires that every class that #inspect is called on
# implement #pretty_print, or a RuntimeError will be raised. # implement #pretty_print, or a RuntimeError will be raised.
def pretty_print_inspect def pretty_print_inspect
if /\(PP::ObjectMixin\)#/ =~ Object.instance_method(:method).bind(self).call(:pretty_print).inspect if Object.instance_method(:method).bind(self).call(:pretty_print).owner == PP::ObjectMixin
raise "pretty_print is not overridden for #{self.class}" raise "pretty_print is not overridden for #{self.class}"
end end
PP.singleline_pp(self, ''.dup) PP.singleline_pp(self, ''.dup)

8
method.h
View file

@ -184,13 +184,13 @@ rb_method_entry_t *rb_method_entry_create(ID called_id, VALUE klass, rb_method_v
const rb_method_entry_t *rb_method_entry_at(VALUE obj, ID id); const rb_method_entry_t *rb_method_entry_at(VALUE obj, ID id);
const rb_method_entry_t *rb_method_entry(VALUE klass, ID id); const rb_method_entry_t *rb_method_entry(VALUE klass, ID id);
const rb_method_entry_t *rb_method_entry_with_refinements(VALUE klass, ID id); const rb_method_entry_t *rb_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class);
const rb_method_entry_t *rb_method_entry_without_refinements(VALUE klass, ID id); const rb_method_entry_t *rb_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class);
const rb_method_entry_t *rb_resolve_refined_method(VALUE refinements, const rb_method_entry_t *me); const rb_method_entry_t *rb_resolve_refined_method(VALUE refinements, const rb_method_entry_t *me);
const rb_callable_method_entry_t *rb_callable_method_entry(VALUE klass, ID id); const rb_callable_method_entry_t *rb_callable_method_entry(VALUE klass, ID id);
const rb_callable_method_entry_t *rb_callable_method_entry_with_refinements(VALUE klass, ID id); const rb_callable_method_entry_t *rb_callable_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class);
const rb_callable_method_entry_t *rb_callable_method_entry_without_refinements(VALUE klass, ID id); const rb_callable_method_entry_t *rb_callable_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class);
const rb_callable_method_entry_t *rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_entry_t *me); const rb_callable_method_entry_t *rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_entry_t *me);
int rb_method_entry_arity(const rb_method_entry_t *me); int rb_method_entry_arity(const rb_method_entry_t *me);

37
proc.c
View file

@ -29,6 +29,7 @@ const rb_cref_t *rb_vm_cref_in_context(VALUE self, VALUE cbase);
struct METHOD { struct METHOD {
const VALUE recv; const VALUE recv;
const VALUE klass; const VALUE klass;
const VALUE iclass;
const rb_method_entry_t * const me; const rb_method_entry_t * const me;
/* for bound methods, `me' should be rb_callable_method_entry_t * */ /* for bound methods, `me' should be rb_callable_method_entry_t * */
}; };
@ -1326,6 +1327,7 @@ bm_mark(void *ptr)
struct METHOD *data = ptr; struct METHOD *data = ptr;
rb_gc_mark(data->recv); rb_gc_mark(data->recv);
rb_gc_mark(data->klass); rb_gc_mark(data->klass);
rb_gc_mark(data->iclass);
rb_gc_mark((VALUE)data->me); rb_gc_mark((VALUE)data->me);
} }
@ -1393,7 +1395,7 @@ mnew_missing(VALUE klass, VALUE obj, ID id, VALUE mclass)
} }
static VALUE static VALUE
mnew_internal(const rb_method_entry_t *me, VALUE klass, mnew_internal(const rb_method_entry_t *me, VALUE klass, VALUE iclass,
VALUE obj, ID id, VALUE mclass, int scope, int error) VALUE obj, ID id, VALUE mclass, int scope, int error)
{ {
struct METHOD *data; struct METHOD *data;
@ -1419,24 +1421,21 @@ mnew_internal(const rb_method_entry_t *me, VALUE klass,
if (me->defined_class) { if (me->defined_class) {
VALUE klass = RCLASS_SUPER(RCLASS_ORIGIN(me->defined_class)); VALUE klass = RCLASS_SUPER(RCLASS_ORIGIN(me->defined_class));
id = me->def->original_id; id = me->def->original_id;
me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(klass, id); me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(klass, id, &iclass);
} }
else { else {
VALUE klass = RCLASS_SUPER(me->owner); VALUE klass = RCLASS_SUPER(me->owner);
id = me->def->original_id; id = me->def->original_id;
me = rb_method_entry_without_refinements(klass, id); me = rb_method_entry_without_refinements(klass, id, &iclass);
} }
goto again; goto again;
} }
while (klass != me->owner && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
klass = RCLASS_SUPER(klass);
}
method = TypedData_Make_Struct(mclass, struct METHOD, &method_data_type, data); method = TypedData_Make_Struct(mclass, struct METHOD, &method_data_type, data);
RB_OBJ_WRITE(method, &data->recv, obj); RB_OBJ_WRITE(method, &data->recv, obj);
RB_OBJ_WRITE(method, &data->klass, klass); RB_OBJ_WRITE(method, &data->klass, klass);
RB_OBJ_WRITE(method, &data->iclass, iclass);
RB_OBJ_WRITE(method, &data->me, me); RB_OBJ_WRITE(method, &data->me, me);
OBJ_INFECT(method, klass); OBJ_INFECT(method, klass);
@ -1444,24 +1443,25 @@ mnew_internal(const rb_method_entry_t *me, VALUE klass,
} }
static VALUE static VALUE
mnew_from_me(const rb_method_entry_t *me, VALUE klass, mnew_from_me(const rb_method_entry_t *me, VALUE klass, VALUE iclass,
VALUE obj, ID id, VALUE mclass, int scope) VALUE obj, ID id, VALUE mclass, int scope)
{ {
return mnew_internal(me, klass, obj, id, mclass, scope, TRUE); return mnew_internal(me, klass, iclass, obj, id, mclass, scope, TRUE);
} }
static VALUE static VALUE
mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope) mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope)
{ {
const rb_method_entry_t *me; const rb_method_entry_t *me;
VALUE iclass = Qnil;
if (obj == Qundef) { /* UnboundMethod */ if (obj == Qundef) { /* UnboundMethod */
me = rb_method_entry_without_refinements(klass, id); me = rb_method_entry_without_refinements(klass, id, &iclass);
} }
else { else {
me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(klass, id); me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(klass, id, &iclass);
} }
return mnew_from_me(me, klass, obj, id, mclass, scope); return mnew_from_me(me, klass, iclass, obj, id, mclass, scope);
} }
static inline VALUE static inline VALUE
@ -1785,7 +1785,7 @@ rb_obj_singleton_method(VALUE obj, VALUE vid)
vid = ID2SYM(id); vid = ID2SYM(id);
goto undef; goto undef;
} }
return mnew_from_me(me, klass, obj, id, rb_cMethod, FALSE); return mnew_from_me(me, klass, klass, obj, id, rb_cMethod, FALSE);
} }
/* /*
@ -2706,15 +2706,18 @@ static VALUE
method_super_method(VALUE method) method_super_method(VALUE method)
{ {
const struct METHOD *data; const struct METHOD *data;
VALUE super_class; VALUE super_class, iclass;
ID mid;
const rb_method_entry_t *me; const rb_method_entry_t *me;
TypedData_Get_Struct(method, struct METHOD, &method_data_type, data); TypedData_Get_Struct(method, struct METHOD, &method_data_type, data);
super_class = RCLASS_SUPER(RCLASS_ORIGIN(method_entry_defined_class(data->me))); iclass = data->iclass;
super_class = RCLASS_SUPER(RCLASS_ORIGIN(iclass));
mid = data->me->called_id;
if (!super_class) return Qnil; if (!super_class) return Qnil;
me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(super_class, data->me->called_id); me = (rb_method_entry_t *)rb_callable_method_entry_without_refinements(super_class, mid, &iclass);
if (!me) return Qnil; if (!me) return Qnil;
return mnew_internal(me, super_class, data->recv, data->me->called_id, rb_obj_class(method), FALSE, FALSE); return mnew_internal(me, me->owner, iclass, data->recv, mid, rb_obj_class(method), FALSE, FALSE);
} }
/* /*

10
test/ruby/test_method.rb
View file

@ -873,6 +873,16 @@ class TestMethod < Test::Unit::TestCase
m = m.super_method m = m.super_method
assert_equal(c1, m.owner, Feature9781) assert_equal(c1, m.owner, Feature9781)
assert_same(o, m.receiver, Feature9781) assert_same(o, m.receiver, Feature9781)
c1 = Class.new {def foo; end}
c2 = Class.new(c1) {include m1; include m2}
m = c2.instance_method(:foo)
assert_equal(m2, m.owner)
m = m.super_method
assert_equal(m1, m.owner)
m = m.super_method
assert_equal(c1, m.owner)
assert_nil(m.super_method)
end end
def test_super_method_removed def test_super_method_removed

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.4" #define RUBY_VERSION "2.4.4"
#define RUBY_RELEASE_DATE "2018-03-20" #define RUBY_RELEASE_DATE "2018-03-21"
#define RUBY_PATCHLEVEL 273 #define RUBY_PATCHLEVEL 274
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 20 #define RUBY_RELEASE_DAY 21
#include "ruby/version.h" #include "ruby/version.h"

2
vm_args.c
View file

@ -803,7 +803,7 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
} }
obj = *argv++; obj = *argv++;
mid = SYM2ID(callback_arg); mid = SYM2ID(callback_arg);
me = rb_callable_method_entry_with_refinements(CLASS_OF(obj), mid); me = rb_callable_method_entry_with_refinements(CLASS_OF(obj), mid, NULL);
th = GET_THREAD(); th = GET_THREAD();
if (!NIL_P(blockarg)) { if (!NIL_P(blockarg)) {
vm_passed_block_handler_set(th, blockarg); vm_passed_block_handler_set(th, blockarg);

7
vm_insnhelper.c
View file

@ -1336,7 +1336,8 @@ check_match(VALUE pattern, VALUE target, enum vm_check_match_type type)
} }
/* fall through */ /* fall through */
case VM_CHECKMATCH_TYPE_CASE: { case VM_CHECKMATCH_TYPE_CASE: {
const rb_callable_method_entry_t *me = rb_callable_method_entry_with_refinements(CLASS_OF(pattern), idEqq); const rb_callable_method_entry_t *me =
rb_callable_method_entry_with_refinements(CLASS_OF(pattern), idEqq, NULL);
if (me) { if (me) {
return vm_call0(GET_THREAD(), pattern, idEqq, 1, &target, me); return vm_call0(GET_THREAD(), pattern, idEqq, 1, &target, me);
} }
@ -1972,7 +1973,7 @@ vm_call_opt_send(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb_calling
DEC_SP(1); DEC_SP(1);
} }
cc->me = rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), ci->mid); cc->me = rb_callable_method_entry_with_refinements(CLASS_OF(calling->recv), ci->mid, NULL);
ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND; ci->flag = VM_CALL_FCALL | VM_CALL_OPT_SEND;
return vm_call_method(th, reg_cfp, calling, ci, cc); return vm_call_method(th, reg_cfp, calling, ci, cc);
} }
@ -2015,7 +2016,7 @@ vm_call_method_missing(rb_thread_t *th, rb_control_frame_t *reg_cfp, struct rb_c
cc_entry = *orig_cc; cc_entry = *orig_cc;
cc_entry.me = cc_entry.me =
rb_callable_method_entry_without_refinements(CLASS_OF(calling->recv), rb_callable_method_entry_without_refinements(CLASS_OF(calling->recv),
idMethodMissing); idMethodMissing, NULL);
cc = &cc_entry; cc = &cc_entry;
calling->argc = argc; calling->argc = argc;

28
vm_method.c
View file

@ -887,31 +887,31 @@ method_entry_resolve_refinement(VALUE klass, ID id, int with_refinement, VALUE *
} }
const rb_method_entry_t * const rb_method_entry_t *
rb_method_entry_with_refinements(VALUE klass, ID id) rb_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr)
{ {
return method_entry_resolve_refinement(klass, id, TRUE, NULL); return method_entry_resolve_refinement(klass, id, TRUE, defined_class_ptr);
} }
const rb_callable_method_entry_t * const rb_callable_method_entry_t *
rb_callable_method_entry_with_refinements(VALUE klass, ID id) rb_callable_method_entry_with_refinements(VALUE klass, ID id, VALUE *defined_class_ptr)
{ {
VALUE defined_class; VALUE defined_class, *dcp = defined_class_ptr ? defined_class_ptr : &defined_class;
const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, TRUE, &defined_class); const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, TRUE, dcp);
return prepare_callable_method_entry(defined_class, id, me); return prepare_callable_method_entry(*dcp, id, me);
} }
const rb_method_entry_t * const rb_method_entry_t *
rb_method_entry_without_refinements(VALUE klass, ID id) rb_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class_ptr)
{ {
return method_entry_resolve_refinement(klass, id, FALSE, NULL); return method_entry_resolve_refinement(klass, id, FALSE, defined_class_ptr);
} }
const rb_callable_method_entry_t * const rb_callable_method_entry_t *
rb_callable_method_entry_without_refinements(VALUE klass, ID id) rb_callable_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class_ptr)
{ {
VALUE defined_class; VALUE defined_class, *dcp = defined_class_ptr ? defined_class_ptr : &defined_class;
const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, FALSE, &defined_class); const rb_method_entry_t *me = method_entry_resolve_refinement(klass, id, FALSE, dcp);
return prepare_callable_method_entry(defined_class, id, me); return prepare_callable_method_entry(*dcp, id, me);
} }
static const rb_method_entry_t * static const rb_method_entry_t *
@ -1091,7 +1091,7 @@ rb_export_method(VALUE klass, ID name, rb_method_visibility_t visi)
int int
rb_method_boundp(VALUE klass, ID id, int ex) rb_method_boundp(VALUE klass, ID id, int ex)
{ {
const rb_method_entry_t *me = rb_method_entry_without_refinements(klass, id); const rb_method_entry_t *me = rb_method_entry_without_refinements(klass, id, NULL);
if (me != 0) { if (me != 0) {
if ((ex & ~BOUND_RESPONDS) && if ((ex & ~BOUND_RESPONDS) &&
@ -1331,7 +1331,7 @@ check_definition(VALUE mod, VALUE mid, rb_method_visibility_t visi)
const rb_method_entry_t *me; const rb_method_entry_t *me;
ID id = rb_check_id(&mid); ID id = rb_check_id(&mid);
if (!id) return Qfalse; if (!id) return Qfalse;
me = rb_method_entry_without_refinements(mod, id); me = rb_method_entry_without_refinements(mod, id, NULL);
if (me) { if (me) {
if (METHOD_ENTRY_VISI(me) == visi) return Qtrue; if (METHOD_ENTRY_VISI(me) == visi) return Qtrue;
} }