summaryrefslogtreecommitdiff
path: root/vm_eval.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-03 08:55:40 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-03 08:55:40 +0000
commit1bd36e36e09f5bccb5110d197e8494d0d7e19000 (patch)
tree5242825f796c48cc8b8fab5cd985b56aeea21616 /vm_eval.c
parentdffe87c72014a4732282126acc87c898fddb0d81 (diff)
merge revision(s) 50430,50440: [Backport #11117]
* vm_eval.c (rb_method_call_status): undefined refined method is not callable unless using. [ruby-core:69064] [Bug #11117] * vm_eval.c (rb_method_call_status): resolve refined method entry to check if undefined. [ruby-core:69064] [Bug #11117] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r--vm_eval.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/vm_eval.c b/vm_eval.c
index da6338419f..5abd8a518d 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -533,8 +533,13 @@ rb_method_call_status(rb_thread_t *th, const rb_method_entry_t *me, call_type sc
int noex;
if (UNDEFINED_METHOD_ENTRY_P(me)) {
+ undefined:
return scope == CALL_VCALL ? NOEX_VCALL : 0;
}
+ if (me->def->type == VM_METHOD_TYPE_REFINED) {
+ me = rb_resolve_refined_method(Qnil, me, NULL);
+ if (UNDEFINED_METHOD_ENTRY_P(me)) goto undefined;
+ }
klass = me->klass;
oid = me->def->original_id;
noex = me->flag;