diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test/ruby/test_module.rb | 15 | ||||
| -rw-r--r-- | vm_insnhelper.c | 9 |
3 files changed, 28 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Thu Aug 29 17:03:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_insnhelper.c (vm_call_method): a method entry refers the based + class/module, so should search superclass from the origin i-class + where the entry belongs to, to get rid of infinite loop when zsuper + in a prepended class/module. [ruby-core:54105] [Bug #8238] + Thu Aug 29 05:35:58 2013 Eric Hodel <drbrain@segment7.net> * ext/zlib/zlib.c (zstream_run): Fix handling of deflate streams that diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index 1124101664..7d5eb99ff0 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -1527,6 +1527,21 @@ class TestModule < Test::Unit::TestCase assert_nothing_raised(NoMethodError, bug8005) {a.send :foo} end + def test_prepend_visibility_inherited + bug8238 = '[ruby-core:54105] [Bug #8238]' + assert_separately [], <<-"end;", timeout: 3 + class A + def foo() A; end + private :foo + end + class B < A + public :foo + prepend Module.new + end + assert_equal(A, B.new.foo, "#{bug8238}") + end; + end + def test_prepend_included_modules bug8025 = '[ruby-core:53158] [Bug #8025]' mixin = labeled_module("mixin") diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 761c830235..f196e5dc2d 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1769,6 +1769,8 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci) start_method_dispatch: if (ci->me != 0) { if ((ci->me->flag == 0)) { + VALUE klass; + normal_method_dispatch: switch (ci->me->def->type) { case VM_METHOD_TYPE_ISEQ:{ @@ -1801,10 +1803,10 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci) return vm_call_bmethod(th, cfp, ci); } case VM_METHOD_TYPE_ZSUPER:{ - VALUE klass; - + klass = ci->me->klass; + klass = RCLASS_ORIGIN(klass); zsuper_method_dispatch: - klass = RCLASS_SUPER(ci->me->klass); + klass = RCLASS_SUPER(klass); ci_temp = *ci; ci = &ci_temp; @@ -1866,6 +1868,7 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci) goto normal_method_dispatch; } else { + klass = ci->me->klass; goto zsuper_method_dispatch; } } |