summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-10 13:02:54 +0000
committershugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-10 13:02:54 +0000
commitfa7c4ab4084ac6d5ad615d133ab0dcaca2c817fb (patch)
tree273489725ac34facac030ee3f5d48ab6ddf4b63e
parenta263a8567a3c0ea3bdd3b3fc10f0880aa23d85b3 (diff)
* vm_method.c (rb_method_entry_without_refinements): use
rb_resolve_refined_method() to search superclasses if me->def->orig_me is 0. This change fixes make test-all TESTS="json ruby/test_refinement.rb". * test/ruby/test_refinement.rb: related test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--test/ruby/test_refinement.rb19
-rw-r--r--vm_method.c2
3 files changed, 29 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e9ba4036d..b53bed607c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Dec 10 18:35:25 2012 Shugo Maeda <shugo@ruby-lang.org>
+
+ * vm_method.c (rb_method_entry_without_refinements): use
+ rb_resolve_refined_method() to search superclasses if
+ me->def->orig_me is 0. This change fixes make test-all
+ TESTS="json ruby/test_refinement.rb".
+
+ * test/ruby/test_refinement.rb: related test.
+
Mon Dec 10 17:59:07 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/fiddle/win32/*: library ports from DL to Fiddle.
diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb
index 97f6db9303..17896eb01d 100644
--- a/test/ruby/test_refinement.rb
+++ b/test/ruby/test_refinement.rb
@@ -129,11 +129,30 @@ class TestRefinement < Test::Unit::TestCase
assert_raise(NoMethodError) { foo.z }
end
+ module RespondTo
+ class Super
+ def foo
+ end
+ end
+
+ class Sub < Super
+ end
+
+ module M
+ refine Sub do
+ def foo
+ end
+ end
+ end
+ end
+
def test_send_should_not_use_refinements
foo = Foo.new
assert_raise(NoMethodError) { foo.send(:z) }
assert_raise(NoMethodError) { FooExtClient.send_z_on(foo) }
assert_raise(NoMethodError) { foo.send(:z) }
+
+ assert_equal(true, RespondTo::Sub.new.respond_to?(:foo))
end
def test_method_should_not_use_refinements
diff --git a/vm_method.c b/vm_method.c
index d33681ac3f..a8efa15f7c 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -637,7 +637,7 @@ rb_method_entry_without_refinements(VALUE klass, ID id,
rb_method_entry_t *me = rb_method_entry(klass, id, &defined_class);
if (me && me->def->type == VM_METHOD_TYPE_REFINED) {
- me = me->def->body.orig_me;
+ me = rb_resolve_refined_method(Qnil, me, &defined_class);
}
if (defined_class_ptr)
*defined_class_ptr = defined_class;