diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_refinement.rb | 13 | ||||
| -rw-r--r-- | vm_method.c | 7 |
3 files changed, 24 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jan 8 17:05:00 2015 Seiei Higa <hanachin@gmail.com> + + * vm_method.c (rb_method_entry): if no super class, no original + method entry. [ruby-core:67389] [Bug #10707] + Thu Jan 8 16:31:43 2015 Seiei Higa <hanachin@gmail.com> * vm_method.c (rb_export_method): bail out if the original method diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 8553c42e18..7973b1aa60 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -1163,6 +1163,19 @@ class TestRefinement < Test::Unit::TestCase assert_raise(NoMethodError, bug10106) {Object.new.foo} end; + + assert_separately([], <<-"end;") + bug10707 = '[ruby-core:67389] [Bug #10707]' + module RefinementBug + refine BasicObject do + def foo + end + end + end + + assert(methods, bug10707) + assert_raise(NameError, bug10707) {method(:foo)} + end; end def test_change_refined_new_method_visibility diff --git a/vm_method.c b/vm_method.c index 97ae64f55d..289c77a4ec 100644 --- a/vm_method.c +++ b/vm_method.c @@ -668,12 +668,17 @@ get_original_method_entry(VALUE refinements, const rb_method_entry_t *me, VALUE *defined_class_ptr) { + VALUE super; + if (me->def->body.orig_me) { return me->def->body.orig_me; } + else if (!(super = RCLASS_SUPER(me->klass))) { + return 0; + } else { rb_method_entry_t *tmp_me; - tmp_me = rb_method_entry(RCLASS_SUPER(me->klass), me->called_id, + tmp_me = rb_method_entry(super, me->called_id, defined_class_ptr); return rb_resolve_refined_method(refinements, tmp_me, defined_class_ptr); |