diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-29 03:11:17 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-29 03:11:17 +0000 |
| commit | a69f01fa52e3ab47fa700442251f73f47846bb9f (patch) | |
| tree | 21edfbc648546117d533a5c0eb1aebaab98964ab /vm_insnhelper.c | |
| parent | cb08e708227216bd2810a6bda18140467d23cb34 (diff) | |
| download | bundler-a69f01fa52e3ab47fa700442251f73f47846bb9f.tar.gz | |
proc.c: fix inherited method owner
* proc.c (mnew_from_me): keep iclass as-is, to make inheritance
chain consistent. [ruby-core:59358] [Bug #9315]
* proc.c (method_owner): return the original defined_class from
prepended iclass, instead.
* vm_insnhelper.c (vm_search_super_method): revert r44455, no
longer defined_class becomes a module.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 8694f524f6..c8cbaa07bf 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2024,11 +2024,6 @@ 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) { - 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); |