summaryrefslogtreecommitdiff
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-03 03:17:22 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-03 03:17:22 +0000
commitadc978adc3932e5fdeb0bdc0622d2f52bf846dba (patch)
treea905fb5a5803c4cf0a4982ef19f92829ce0c8ee5 /vm_insnhelper.c
parentbfcd4e54538b1dd415ed1f3bebe482df11b383c2 (diff)
* vm_insnhelper.c (vm_call_method): protected singleton methods should
be visible from same real class methods. [ruby-core:33506] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 18c22cb81d..6ec6026e37 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -629,7 +629,10 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp,
else if (!(flag & VM_CALL_OPT_SEND_BIT) && (me->flag & NOEX_MASK) & NOEX_PROTECTED) {
VALUE defined_class = me->klass;
- if (TYPE(defined_class) == T_ICLASS) {
+ if (FL_TEST(defined_class, FL_SINGLETON)) {
+ defined_class = RCLASS_SUPER(defined_class);
+ }
+ else if (RB_TYPE_P(defined_class, T_ICLASS)) {
defined_class = RBASIC(defined_class)->klass;
}