diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-08 13:53:18 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-08 13:53:18 +0000 |
commit | 5c0d17c9a2fbbb60e24cd6bd41ffdf8b63b07318 (patch) | |
tree | 679385a31a6805ce4f33e6299c023c52ea41a86c | |
parent | fe46b2d5f05057dd2d238d71fc2276406d259cef (diff) |
vm_insnhelper.c: revive r44455 for bound module method
* vm_insnhelper.c (vm_search_super_method): when super called in a
bound UnboundMethod generated from a module, no superclass is
found since the current defined class is the module, then call
method_missing in that case. [ruby-core:59619] [Bug #9377]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44527 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | test/ruby/test_super.rb | 13 | ||||
-rw-r--r-- | vm_insnhelper.c | 6 |
3 files changed, 26 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Wed Jan 8 22:53:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * vm_insnhelper.c (vm_search_super_method): when super called in a + bound UnboundMethod generated from a module, no superclass is + found since the current defined class is the module, then call + method_missing in that case. [ruby-core:59619] [Bug #9377] + Wed Jan 8 15:55:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * hash.c (rb_objid_hash): return hash value from object ID with a diff --git a/test/ruby/test_super.rb b/test/ruby/test_super.rb index c5f724ebb8..30cc3d8e86 100644 --- a/test/ruby/test_super.rb +++ b/test/ruby/test_super.rb @@ -440,4 +440,17 @@ class TestSuper < Test::Unit::TestCase assert_equal(:ok, o.method(:foo).call, bug9315) end end + + def test_missing_super_in_module_unbound_method + bug9377 = '[ruby-core:59619] [Bug #9377]' + + a = Module.new do + def foo; super end + end + + m = a.instance_method(:foo).bind(Object.new.extend(a)) + assert_raise(NoMethodError, bug9377) do + m.call + end + end end diff --git a/vm_insnhelper.c b/vm_insnhelper.c index c8cbaa07bf..eb3ba37623 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2024,6 +2024,12 @@ vm_search_super_method(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_inf " by define_method() is not supported." " Specify all arguments explicitly."); } + if (!ci->klass) { + /* bound instance method of module */ + ci->aux.missing_reason = NOEX_SUPER; + CI_SET_FASTPATH(ci, vm_call_method_missing, 1); + return; + } /* TODO: use inline cache */ ci->me = rb_method_entry(ci->klass, ci->mid, &ci->defined_class); |