diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-20 16:04:34 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-20 16:04:34 +0000 |
commit | 3e199f4c2b49a17104a0878f8e8505ab2411a608 (patch) | |
tree | a272e45a91754d8e77a080e48333f5d12edb7944 /vm.c | |
parent | 534c2b03b30d60d2490a5550c7c43b2272b108d1 (diff) |
merge revision(s) 50172,50173: [Backport #11027]
* vm_args.c: protect value stack from calling other methods
during complex parameter setting process (splat, kw, and so on).
[Bug #11027]
* vm_core.h: remove rb_thead_t::mark_stack_len.
With this modification, we don't need to use th->mark_stack_len.
* test/ruby/test_keyword.rb: add a test.
* cont.c (cont_capture): catch up this fix.
* vm.c (rb_thread_mark): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -2015,7 +2015,6 @@ rb_thread_mark(void *ptr) rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size); rb_gc_mark_values((long)(sp - p), p); - rb_gc_mark_locations(sp, sp + th->mark_stack_len); while (cfp != limit_cfp) { rb_iseq_t *iseq = cfp->iseq; |