diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 01:43:59 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 01:43:59 +0000 |
commit | 19bbab6140847de08dd0278a7ebaae6b01352513 (patch) | |
tree | 45adc1914ed6ec3198dbc48b7a7d91c57f531ac0 /vm_insnhelper.c | |
parent | 3b39217fb4f115129522207e083a4875beecf5e9 (diff) | |
download | ruby-19bbab6140847de08dd0278a7ebaae6b01352513.tar.gz |
* vm_eval.c (method_missing): should not pop cfp if missing method
is method_missing. [ruby-core:22298]
* vm_eval.c (rb_raise_method_missing): new function to directly
raise NoMethodError.
* vm_insnhelper.c (vm_call_method): fixed the case method_missing
is missing.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 0e54dddc59..ffb36e9a00 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -403,20 +403,25 @@ vm_call_bmethod(rb_thread_t *th, ID id, VALUE procval, VALUE recv, return val; } -static inline VALUE -vm_method_missing(rb_thread_t *th, ID id, VALUE recv, +static inline void +vm_method_missing_args(rb_thread_t *th, VALUE *argv, int num, rb_block_t *blockptr, int opt) { - VALUE val; rb_control_frame_t * const reg_cfp = th->cfp; - VALUE *argv = ALLOCA_N(VALUE, num + 1); MEMCPY(argv, STACK_ADDR_FROM_TOP(num + 1), VALUE, num + 1); - argv[0] = ID2SYM(id); th->method_missing_reason = opt; th->passed_block = blockptr; POPN(num + 1); - val = rb_funcall2(recv, idMethodMissing, num + 1, argv); - return val; +} + +static inline VALUE +vm_method_missing(rb_thread_t *th, ID id, VALUE recv, + int num, rb_block_t *blockptr, int opt) +{ + VALUE *argv = ALLOCA_N(VALUE, num + 1); + vm_method_missing_args(th, argv, num, blockptr, opt); + argv[0] = ID2SYM(id); + return rb_funcall2(recv, idMethodMissing, num + 1, argv); } static inline void @@ -581,17 +586,19 @@ vm_call_method(rb_thread_t * const th, rb_control_frame_t * const cfp, } else { /* method missing */ + int stat = 0; + if (flag & VM_CALL_VCALL_BIT) { + stat |= NOEX_VCALL; + } + if (flag & VM_CALL_SUPER_BIT) { + stat |= NOEX_SUPER; + } if (id == idMethodMissing) { - rb_bug("method missing"); + VALUE *argv = ALLOCA_N(VALUE, num); + vm_method_missing_args(th, argv, num - 1, 0, stat); + rb_raise_method_missing(th, num, argv, recv, stat); } else { - int stat = 0; - if (flag & VM_CALL_VCALL_BIT) { - stat |= NOEX_VCALL; - } - if (flag & VM_CALL_SUPER_BIT) { - stat |= NOEX_SUPER; - } val = vm_method_missing(th, id, recv, num, blockptr, stat); } } |