diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-18 02:48:13 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-18 02:48:13 +0000 |
| commit | 4d3a58bc693dc589293426c0115cbc6897e0a45e (patch) | |
| tree | 4851f72f535acd79f520655c2cb3b4754eb8373e /insnhelper.ci | |
| parent | 69dd06ae685b41ed9a77c4b2bdfa5587c12c5019 (diff) | |
* compile.c (iseq_set_arguments), insnhelper.ci
(vm_callee_setup_arg, vm_yield_setup_args):
* bootstraptest/test_block.rb: add tests for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insnhelper.ci')
| -rw-r--r-- | insnhelper.ci | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/insnhelper.ci b/insnhelper.ci index 8f71703cb6..2922163733 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 == 1) { + if (iseq->arg_simple & 0x01) { /* simple check */ if (argc != m) { rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", @@ -683,7 +683,9 @@ vm_yield_setup_args(rb_thread_t *th, rb_iseq_t *iseq, * => {|a|} => a = [1, 2] * => {|a, b|} => a, b = [1, 2] */ - if (iseq->arg_simple != 2 && (m + iseq->arg_post_len) > 0 && argc == 1 && TYPE(argv[0]) == T_ARRAY) { + if (!(iseq->arg_simple & 0x02) && + (m + iseq->arg_post_len) > 0 && + argc == 1 && TYPE(argv[0]) == T_ARRAY) { VALUE ary = argv[0]; th->mark_stack_len = argc = RARRAY_LEN(ary); @@ -1316,7 +1318,8 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_num_t throw_state, VAL th->state = GET_THROWOBJ_STATE(err); } else { - th->state = FIX2INT(rb_ivar_get(err, idThrowState)); + th->state = TAG_RAISE; + //th->state = FIX2INT(rb_ivar_get(err, idThrowState)); } return err; } |