From d9bf8874825f26c82f8a099d429bc8c0934d5bc6 Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 13 Nov 2015 17:38:12 +0000 Subject: * vm.c (vm_define_method): do not use current CREF immediately, but check CREF in environment or methods. Methods defined in methods should be public. [Bug #11571] * vm_method.c (rb_scope_module_func_check): check CREF in env or me. if CREF is contained by `me', then return FALSE. * test/ruby/test_method.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++++++++++ test/ruby/test_method.rb | 17 +++++++++++++++++ vm.c | 19 +++++++++++-------- vm_method.c | 10 +++++++++- 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b43b1cea1..51490c8f94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sat Nov 14 02:34:43 2015 Koichi Sasada + + * vm.c (vm_define_method): do not use current CREF immediately, + but check CREF in environment or methods. Methods defined in methods + should be public. + [Bug #11571] + + * vm_method.c (rb_scope_module_func_check): check CREF in env or me. + if CREF is contained by `me', then return FALSE. + + * test/ruby/test_method.rb: add a test. + Sat Nov 14 02:19:16 2015 Koichi Sasada * method.h: constify rb_cref_t::scope_visi; diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index e8b8b4b86f..9e20d5cc22 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -919,4 +919,21 @@ class TestMethod < Test::Unit::TestCase assert_equal(456, b.local_variable_get(:bar)) assert_equal([:bar, :foo], b.local_variables.sort) end + + class MethodInMethodClass + def m1 + def m2 + end + end + private + end + + def test_method_in_method_visibility_should_be_public + assert_equal([:m1].sort, MethodInMethodClass.public_instance_methods(false).sort) + assert_equal([].sort, MethodInMethodClass.private_instance_methods(false).sort) + + MethodInMethodClass.new.m1 + assert_equal([:m1, :m2].sort, MethodInMethodClass.public_instance_methods(false).sort) + assert_equal([].sort, MethodInMethodClass.private_instance_methods(false).sort) + end end diff --git a/vm.c b/vm.c index 1e2b4dc1c4..a2e39384d8 100644 --- a/vm.c +++ b/vm.c @@ -2340,22 +2340,25 @@ static void vm_define_method(rb_thread_t *th, VALUE obj, ID id, VALUE iseqval, rb_num_t is_singleton, rb_cref_t *cref) { - VALUE klass = CREF_CLASS(cref); - const rb_scope_visibility_t *scope_visi = CREF_SCOPE_VISI(cref); - rb_method_visibility_t visi = scope_visi->method_visi; + VALUE klass; + rb_method_visibility_t visi; - if (NIL_P(klass)) { - rb_raise(rb_eTypeError, "no class/module to add method"); + if (!is_singleton) { + klass = obj; + visi = rb_scope_visibility_get(); } - - if (is_singleton) { + else { /* singleton */ klass = rb_singleton_class(obj); /* class and frozen checked in this API */ visi = METHOD_VISI_PUBLIC; } + if (NIL_P(klass)) { + rb_raise(rb_eTypeError, "no class/module to add method"); + } + rb_add_method_iseq(klass, id, (const rb_iseq_t *)iseqval, cref, visi); - if (!is_singleton && scope_visi->module_func) { + if (!is_singleton && rb_scope_module_func_check()) { klass = rb_singleton_class(klass); rb_add_method_iseq(klass, id, (const rb_iseq_t *)iseqval, cref, METHOD_VISI_PUBLIC); } diff --git a/vm_method.c b/vm_method.c index 6c2137b7b3..1bc499f1b5 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1045,7 +1045,15 @@ rb_scope_visibility_get(void) static int rb_scope_module_func_check(void) { - return CREF_SCOPE_VISI(rb_vm_cref())->module_func; + rb_thread_t *th = GET_THREAD(); + rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp); + + if (!vm_env_cref_by_cref(cfp->ep)) { + return FALSE; + } + else { + return CREF_SCOPE_VISI(rb_vm_cref())->module_func; + } } static void -- cgit v1.2.3