From b3bd21b90b6edf7b0e2d37ad760d6049e8fdaac2 Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 27 Oct 2017 01:31:15 +0000 Subject: ec->th for vm_cref_push() and constify. * vm_insnhelper.c (vm_cref_push): accepts `ec` instead of `th`. * vm_insnhelper.c: consitfy the first parameter (ec): * lep_svar * lep_svar_write * lep_svar_get * lep_svar_set * vm_getspecial and added vm_cref_push. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index bc8ca02790..3cdf4154ac 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1583,7 +1583,7 @@ yield_under(VALUE under, VALUE self, int argc, const VALUE *argv) VM_FORCE_WRITE_SPECIAL_CONST(&VM_CF_LEP(th->ec->cfp)[VM_ENV_DATA_INDEX_SPECVAL], new_block_handler); } - cref = vm_cref_push(th, under, ep, TRUE); + cref = vm_cref_push(th->ec, under, ep, TRUE); return vm_yield_with_cref(th, argc, argv, cref, is_lambda); } @@ -1601,7 +1601,7 @@ rb_yield_refine_block(VALUE refinement, VALUE refinements) struct rb_captured_block new_captured = *captured; VALUE new_block_handler = VM_BH_FROM_ISEQ_BLOCK(&new_captured); const VALUE *ep = captured->ep; - rb_cref_t *cref = vm_cref_push(th, refinement, ep, TRUE); + rb_cref_t *cref = vm_cref_push(th->ec, refinement, ep, TRUE); CREF_REFINEMENTS_SET(cref, refinements); VM_FORCE_WRITE_SPECIAL_CONST(&VM_CF_LEP(th->ec->cfp)[VM_ENV_DATA_INDEX_SPECVAL], new_block_handler); new_captured.self = refinement; @@ -1613,7 +1613,7 @@ rb_yield_refine_block(VALUE refinement, VALUE refinements) static VALUE eval_under(VALUE under, VALUE self, VALUE src, VALUE file, int line) { - rb_cref_t *cref = vm_cref_push(GET_THREAD(), under, NULL, SPECIAL_CONST_P(self) && !NIL_P(under)); + rb_cref_t *cref = vm_cref_push(GET_EC(), under, NULL, SPECIAL_CONST_P(self) && !NIL_P(under)); SafeStringValue(src); return eval_string_with_cref(self, src, Qnil, cref, file, line); } -- cgit v1.2.3