1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

accept ec instead of th.

Browse Source 
* vm.c: VM_EP_IN_HEAP_P() and vm_ep_in_heap_p_() only requires ec
  pointed from th.

* vm.c (rb_execution_context_mark): GET_THREAD() returns current
  running thread and we need to use marking thread here. Pass marking
  thread's ec instead of current thread.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-09-06 03:39:26 +00:00
parent e413909516
commit 7119de47c7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vm.c
View File

@ -101,10 +101,10 @@ VM_CFP_IN_HEAP_P(const rb_thread_t *th, const rb_control_frame_t *cfp)
} }
static int static int
VM_EP_IN_HEAP_P(const rb_thread_t *th, const VALUE *ep) VM_EP_IN_HEAP_P(const rb_execution_context_t *ec, const VALUE *ep)
{ {
const VALUE *start = th->ec.vm_stack; const VALUE *start = ec->vm_stack;
const VALUE *end = (VALUE *)th->ec.cfp; const VALUE *end = (VALUE *)ec->cfp;
VM_ASSERT(start != NULL); VM_ASSERT(start != NULL);
if (start <= ep && ep < end) { if (start <= ep && ep < end) {
@ -116,9 +116,9 @@ VM_EP_IN_HEAP_P(const rb_thread_t *th, const VALUE *ep)
} }
int int
vm_ep_in_heap_p_(const rb_thread_t *th, const VALUE *ep) vm_ep_in_heap_p_(const rb_execution_context_t *ec, const VALUE *ep)
{ {
if (VM_EP_IN_HEAP_P(th, ep)) { if (VM_EP_IN_HEAP_P(ec, ep)) {
VALUE envval = ep[VM_ENV_DATA_INDEX_ENV]; /* VM_ENV_ENVVAL(ep); */ VALUE envval = ep[VM_ENV_DATA_INDEX_ENV]; /* VM_ENV_ENVVAL(ep); */
if (envval != Qundef) { if (envval != Qundef) {
@ -138,7 +138,7 @@ vm_ep_in_heap_p_(const rb_thread_t *th, const VALUE *ep)
int int
rb_vm_ep_in_heap_p(const VALUE *ep) rb_vm_ep_in_heap_p(const VALUE *ep)
{ {
return vm_ep_in_heap_p_(GET_THREAD(), ep); return vm_ep_in_heap_p_(&GET_THREAD()->ec, ep);
} }
#endif #endif
@ -813,7 +813,7 @@ rb_proc_create_from_captured(VALUE klass,
VALUE procval = rb_proc_alloc(klass); VALUE procval = rb_proc_alloc(klass);
rb_proc_t *proc = RTYPEDDATA_DATA(procval); rb_proc_t *proc = RTYPEDDATA_DATA(procval);
VM_ASSERT(VM_EP_IN_HEAP_P(GET_THREAD(), captured->ep)); VM_ASSERT(VM_EP_IN_HEAP_P(&GET_THREAD()->ec, captured->ep));
/* copy block */ /* copy block */
RB_OBJ_WRITE(procval, &proc->block.as.captured.self, captured->self); RB_OBJ_WRITE(procval, &proc->block.as.captured.self, captured->self);
@ -855,7 +855,7 @@ rb_proc_create(VALUE klass, const struct rb_block *block,
VALUE procval = rb_proc_alloc(klass); VALUE procval = rb_proc_alloc(klass);
rb_proc_t *proc = RTYPEDDATA_DATA(procval); rb_proc_t *proc = RTYPEDDATA_DATA(procval);
VM_ASSERT(VM_EP_IN_HEAP_P(GET_THREAD(), vm_block_ep(block))); VM_ASSERT(VM_EP_IN_HEAP_P(&GET_THREAD()->ec, vm_block_ep(block)));
rb_vm_block_copy(procval, &proc->block, block); rb_vm_block_copy(procval, &proc->block, block);
vm_block_type_set(&proc->block, block->type); vm_block_type_set(&proc->block, block->type);
proc->safe_level = safe_level; proc->safe_level = safe_level;
@ -880,7 +880,7 @@ rb_vm_make_proc_lambda(rb_thread_t *th, const struct rb_captured_block *captured
rb_control_frame_t *cfp = VM_CAPTURED_BLOCK_TO_CFP(captured); rb_control_frame_t *cfp = VM_CAPTURED_BLOCK_TO_CFP(captured);
vm_make_env_object(th, cfp); vm_make_env_object(th, cfp);
} }
VM_ASSERT(VM_EP_IN_HEAP_P(th, captured->ep)); VM_ASSERT(VM_EP_IN_HEAP_P(&th->ec, captured->ep));
VM_ASSERT(imemo_type_p(captured->code.val, imemo_iseq) || VM_ASSERT(imemo_type_p(captured->code.val, imemo_iseq) ||
imemo_type_p(captured->code.val, imemo_ifunc)); imemo_type_p(captured->code.val, imemo_ifunc));
@ -2380,7 +2380,7 @@ rb_execution_context_mark(const rb_execution_context_t *ec)
while (cfp != limit_cfp) { while (cfp != limit_cfp) {
#if VM_CHECK_MODE > 0 #if VM_CHECK_MODE > 0
const VALUE *ep = cfp->ep; const VALUE *ep = cfp->ep;
VM_ASSERT(!!VM_ENV_FLAGS(ep, VM_ENV_FLAG_ESCAPED) == vm_ep_in_heap_p_(GET_THREAD(), ep)); VM_ASSERT(!!VM_ENV_FLAGS(ep, VM_ENV_FLAG_ESCAPED) == vm_ep_in_heap_p_(ec, ep));
#endif #endif
rb_gc_mark(cfp->self); rb_gc_mark(cfp->self);
rb_gc_mark((VALUE)cfp->iseq); rb_gc_mark((VALUE)cfp->iseq);