From a6d34e75019f484baf6e27ae9af93d0093554ef3 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 3 Aug 2014 01:43:10 +0000 Subject: [PATCH] vm_insnhelper.c: fix unusable super class * 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/trunk@47037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/ruby/test_refinement.rb | 15 +++++++++++++++ vm_insnhelper.c | 4 ++++ 3 files changed, 25 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5351be96fe..dd4136469d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Aug 3 10:43:08 2014 Nobuyoshi Nakada + + * 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] + Sat Aug 2 23:47:45 2014 Masaki Suketa * ext/win32ole/win32ole.c: separate WIN32OLE::VARIANT src file diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 88754df75b..5a60a6afe9 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -1151,6 +1151,21 @@ class TestRefinement < Test::Unit::TestCase INPUT end + def test_refine_basic_object + assert_separately([], <<-"end;") + bug10106 = '[ruby-core:64166] [Bug #10106]' + module RefinementBug + refine BasicObject do + def foo + 1 + end + end + end + + assert_raise(NoMethodError, bug10106) {Object.new.foo} + end; + end + private def eval_using(mod, s) diff --git a/vm_insnhelper.c b/vm_insnhelper.c index d6dd01f1bb..e899c1b6b4 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1823,6 +1823,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;