From 43bb0238ee52c34aab58b1c2b7afb75751209148 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 26 Oct 2017 14:44:09 +0000 Subject: replace `GET_THREAD()->ec` to `GET_EC()`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vm.c') diff --git a/vm.c b/vm.c index 92cad06206..d8ddb7a243 100644 --- a/vm.c +++ b/vm.c @@ -815,7 +815,7 @@ rb_proc_create_from_captured(VALUE klass, VALUE procval = rb_proc_alloc(klass); rb_proc_t *proc = RTYPEDDATA_DATA(procval); - VM_ASSERT(VM_EP_IN_HEAP_P(GET_THREAD()->ec, captured->ep)); + VM_ASSERT(VM_EP_IN_HEAP_P(GET_EC(), captured->ep)); /* copy block */ RB_OBJ_WRITE(procval, &proc->block.as.captured.self, captured->self); @@ -857,7 +857,7 @@ rb_proc_create(VALUE klass, const struct rb_block *block, VALUE procval = rb_proc_alloc(klass); rb_proc_t *proc = RTYPEDDATA_DATA(procval); - VM_ASSERT(VM_EP_IN_HEAP_P(GET_THREAD()->ec, vm_block_ep(block))); + VM_ASSERT(VM_EP_IN_HEAP_P(GET_EC(), vm_block_ep(block))); rb_vm_block_copy(procval, &proc->block, block); vm_block_type_set(&proc->block, block->type); proc->safe_level = safe_level; @@ -1447,7 +1447,7 @@ rb_vm_make_jump_tag_but_local_jump(int state, VALUE val) return Qnil; } if (val == Qundef) { - val = GET_THREAD()->ec->tag->retval; + val = GET_EC()->tag->retval; } return make_localjump_error(mesg, val, state); } @@ -3293,7 +3293,7 @@ vm_analysis_operand(int insn, int n, VALUE op) HASH_ASET(ihash, INT2FIX(n), ophash); } /* intern */ - valstr = rb_insn_operand_intern(GET_THREAD()->ec->cfp->iseq, insn, n, op, 0, 0, 0, 0); + valstr = rb_insn_operand_intern(GET_EC()->cfp->iseq, insn, n, op, 0, 0, 0, 0); /* set count */ if ((cv = rb_hash_aref(ophash, valstr)) == Qnil) { @@ -3406,7 +3406,7 @@ vm_collect_usage_operand(int insn, int n, VALUE op) if (RUBY_DTRACE_INSN_OPERAND_ENABLED()) { VALUE valstr; - valstr = rb_insn_operand_intern(GET_THREAD()->ec->cfp->iseq, insn, n, op, 0, 0, 0, 0); + valstr = rb_insn_operand_intern(GET_EC()->cfp->iseq, insn, n, op, 0, 0, 0, 0); RUBY_DTRACE_INSN_OPERAND(RSTRING_PTR(valstr), rb_insns_name(insn)); RB_GC_GUARD(valstr); -- cgit v1.2.3