diff options
author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-24 15:17:08 +0000 |
---|---|---|
committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-24 15:17:08 +0000 |
commit | ba8413c27cc6dd36f2f54f51a17aae47ee482178 (patch) | |
tree | 43bb97a85cb0b82e62a14ba15aba750286dbea83 /vm_insnhelper.c | |
parent | 63f51f528312c1c534bdc8418520299781145e6a (diff) | |
download | ruby-ba8413c27cc6dd36f2f54f51a17aae47ee482178.tar.gz |
vm.c: simplify the implementation of r64031
because such inconsistency may result in the regression fixed in r64034.
vm_exec is not touched since renaming it may be controversial...
vm_args.c: ditto.
vm_eval.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64035 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
-rw-r--r-- | vm_insnhelper.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 3fac8eb1fa..b8a5112de7 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1302,7 +1302,7 @@ vm_expandarray(VALUE *sp, VALUE ary, rb_num_t num, int flag) static VALUE vm_call_general(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_call_cache *cc); MJIT_FUNC_EXPORTED void -vm_search_method_slowpath(const struct rb_call_info *ci, struct rb_call_cache *cc, VALUE klass) +rb_vm_search_method_slowpath(const struct rb_call_info *ci, struct rb_call_cache *cc, VALUE klass) { cc->me = rb_callable_method_entry(klass, ci->mid); VM_ASSERT(callable_method_entry_p(cc->me)); @@ -1333,7 +1333,7 @@ vm_search_method(const struct rb_call_info *ci, struct rb_call_cache *cc, VALUE } RB_DEBUG_COUNTER_INC(mc_inline_miss); #endif - vm_search_method_slowpath(ci, cc, klass); + rb_vm_search_method_slowpath(ci, cc, klass); } static inline int @@ -1473,7 +1473,7 @@ rb_eql_opt(VALUE obj1, VALUE obj2) return opt_eql_func(obj1, obj2, &ci, &cc); } -extern VALUE vm_call0(rb_execution_context_t *ec, VALUE, ID, int, const VALUE*, const rb_callable_method_entry_t *); +extern VALUE rb_vm_call0(rb_execution_context_t *ec, VALUE, ID, int, const VALUE*, const rb_callable_method_entry_t *); static VALUE check_match(rb_execution_context_t *ec, VALUE pattern, VALUE target, enum vm_check_match_type type) @@ -1490,7 +1490,7 @@ check_match(rb_execution_context_t *ec, VALUE pattern, VALUE target, enum vm_che const rb_callable_method_entry_t *me = rb_callable_method_entry_with_refinements(CLASS_OF(pattern), idEqq, NULL); if (me) { - return vm_call0(ec, pattern, idEqq, 1, &target, me); + return rb_vm_call0(ec, pattern, idEqq, 1, &target, me); } else { /* fallback to funcall (e.g. method_missing) */ @@ -1972,7 +1972,7 @@ vm_call_bmethod_body(rb_execution_context_t *ec, struct rb_calling_info *calling /* control block frame */ ec->passed_bmethod_me = cc->me; GetProcPtr(cc->me->def->body.proc, proc); - val = vm_invoke_bmethod(ec, proc, calling->recv, calling->argc, argv, calling->block_handler); + val = rb_vm_invoke_bmethod(ec, proc, calling->recv, calling->argc, argv, calling->block_handler); return val; } |