diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-03 01:43:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-03 01:43:10 +0000 |
commit | a6d34e75019f484baf6e27ae9af93d0093554ef3 (patch) | |
tree | 7202cb8506380831b56b16fd066975c2f5ac6e17 | |
parent | c3e1258ccd2fac7e1d62262ce1a66dba40119fce (diff) | |
download | ruby-a6d34e75019f484baf6e27ae9af93d0093554ef3.tar.gz |
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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/ruby/test_refinement.rb | 15 | ||||
-rw-r--r-- | vm_insnhelper.c | 4 |
3 files changed, 25 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Sun Aug 3 10:43:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <masaki.suketa@nifty.ne.jp> * 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; |