diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-18 04:17:39 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-18 04:17:39 +0000 |
| commit | 2e83c555d83d379f65f8e6af79ce7bda36a7ba2c (patch) | |
| tree | 7370b26d8d3896d0d10d7cf8be12bc4f4811563d /insnhelper.ci | |
| parent | f72409043cb0e9cdea665ee7248ec98a9e523016 (diff) | |
* insnhelper.ci (vm_callee_setup_arg): fix to check arguments
correctly. [ruby-dev:31472]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insnhelper.ci')
| -rw-r--r-- | insnhelper.ci | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/insnhelper.ci b/insnhelper.ci index 2922163733..17c4047798 100644 --- a/insnhelper.ci +++ b/insnhelper.ci @@ -103,7 +103,7 @@ vm_callee_setup_arg(rb_thread_t *th, rb_iseq_t *iseq, const int m = iseq->argc; const int orig_argc = argc; - if (iseq->arg_simple & 0x01) { + if (LIKELY(iseq->arg_simple & 0x01)) { /* simple check */ if (argc != m) { rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", @@ -136,7 +136,7 @@ vm_callee_setup_arg(rb_thread_t *th, rb_iseq_t *iseq, for (i=0; i<iseq->arg_post_len; i++) { dst[iseq->arg_post_start + iseq->arg_post_len - (i + 1)] = argv[argc - 1]; - argc = argc - 1; + argc--; } } @@ -162,6 +162,7 @@ vm_callee_setup_arg(rb_thread_t *th, rb_iseq_t *iseq, /* rest arguments */ if (iseq->arg_rest != -1) { dst[iseq->arg_rest] = rb_ary_new4(argc, argv); + argc = 0; } /* block arguments */ @@ -169,6 +170,11 @@ vm_callee_setup_arg(rb_thread_t *th, rb_iseq_t *iseq, VALUE blockval = Qnil; rb_block_t * const blockptr = *block; + if (argc != 0) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", + orig_argc, m + iseq->arg_post_len); + } + if (blockptr) { /* make Proc object */ if (blockptr->proc == 0) { |