diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-01 10:52:52 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-01 10:52:52 +0000 |
commit | c90550c251f0c598458d52dd2cbd5445e8d26c65 (patch) | |
tree | d8aef428c1f3e22d9f9261ccd402f50f93d4453c /vm_insnhelper.c | |
parent | de2c8c9dbc1e324ce9bb04a01cd209b76f2edc26 (diff) | |
download | ruby-c90550c251f0c598458d52dd2cbd5445e8d26c65.tar.gz |
vm_args.c: fix marking symbol ifunc
* vm_args.c (vm_caller_setup_arg_block): store new ifunc for
symbol in control frame proc to be marked.
* proc.c (proc_new), vm_insnhelper.c (vm_yield_with_cfunc):
block->proc may be an ifunc now.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 59adf8877d..40c208c5bc 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -2297,11 +2297,10 @@ vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block, VALUE self, { const struct vm_ifunc *ifunc = (struct vm_ifunc *)block->iseq; VALUE val, arg, blockarg; - int lambda = block_proc_is_lambda(block->proc); const rb_callable_method_entry_t *me = th->passed_bmethod_me; th->passed_bmethod_me = NULL; - if (lambda) { + if (!RUBY_VM_IFUNC_P(block->proc) && block_proc_is_lambda(block->proc)) { arg = rb_ary_new4(argc, argv); } else if (argc == 0) { |