summaryrefslogtreecommitdiff
path: root/vm_insnhelper.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-22 17:49:32 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-22 17:49:32 +0000
commit80aa5ce577f91c491d16332a07a7f32001a72137 (patch)
tree8e745a6e2f2d5a7c4f51f2f328331a8fd924d8a8 /vm_insnhelper.c
parentb4893fc3d159204f567da5337494e224d65f6fbf (diff)
merge revision(s) r47037: [Backport #10106]
* vm_insnhelper.c (vm_call_method): unusable super class should cause method missing when BasicObject is refined but not been using. [ruby-core:64166] [Bug #10106] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r--vm_insnhelper.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 03493c13c8..f52a8f562d 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1791,6 +1791,10 @@ vm_call_method(rb_thread_t *th, rb_control_frame_t *cfp, rb_call_info_t *ci)
klass = RCLASS_ORIGIN(klass);
zsuper_method_dispatch:
klass = RCLASS_SUPER(klass);
+ if (!klass) {
+ ci->me = 0;
+ goto start_method_dispatch;
+ }
ci_temp = *ci;
ci = &ci_temp;