summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-16 05:34:27 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-16 05:34:27 (GMT)
commitb3e9fce0367c3a16755efeff23c6df08ee19d81d (patch)
tree83e13ef673354fc9324e6dc34ac331151c329a74 /vm.c
parentaab3599daea682898556c2b54a43a9cef07c5ce3 (diff)
vm.c: fix mark with rewinding cfp
* vm.c (REWIND_CFP): keep the arguments region inside the valid value stack. [ruby-core:69969] [Bug #11352] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/vm.c b/vm.c
index 372ba8d..bbd5320 100644
--- a/vm.c
+++ b/vm.c
@@ -2297,7 +2297,11 @@ vm_define_method(rb_thread_t *th, VALUE obj, ID id, VALUE iseqval,
#define REWIND_CFP(expr) do { \
rb_thread_t *th__ = GET_THREAD(); \
- th__->cfp++; expr; th__->cfp--; \
+ VALUE *const curr_sp = (th__->cfp++)->sp; \
+ VALUE *const saved_sp = th__->cfp->sp; \
+ th__->cfp->sp = curr_sp; \
+ expr; \
+ (th__->cfp--)->sp = saved_sp; \
} while (0)
static VALUE
@@ -2400,7 +2404,6 @@ static VALUE
core_hash_merge_ary(VALUE hash, VALUE ary)
{
core_hash_merge(hash, RARRAY_LEN(ary), RARRAY_CONST_PTR(ary));
- RB_GC_GUARD(ary);
return hash;
}
@@ -2408,14 +2411,8 @@ static VALUE
m_core_hash_merge_ptr(int argc, VALUE *argv, VALUE recv)
{
VALUE hash = argv[0];
- VALUE *args;
-
- --argc; ++argv;
- VM_ASSERT(argc <= 256);
- args = ALLOCA_N(VALUE, argc);
- MEMCPY(args, argv, VALUE, argc);
- argv = args;
- REWIND_CFP(core_hash_merge(hash, argc, argv));
+
+ REWIND_CFP(core_hash_merge(hash, argc-1, argv+1));
return hash;
}