From ba8413c27cc6dd36f2f54f51a17aae47ee482178 Mon Sep 17 00:00:00 2001 From: k0kubun Date: Tue, 24 Jul 2018 15:17:08 +0000 Subject: 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 --- vm_eval.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index c726c61f0b..fcc87cb6d1 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -41,7 +41,7 @@ static VALUE vm_call0_body(rb_execution_context_t* ec, struct rb_calling_info *c #ifndef MJIT_HEADER MJIT_FUNC_EXPORTED VALUE -vm_call0(rb_execution_context_t *ec, VALUE recv, ID id, int argc, const VALUE *argv, const rb_callable_method_entry_t *me) +rb_vm_call0(rb_execution_context_t *ec, VALUE recv, ID id, int argc, const VALUE *argv, const rb_callable_method_entry_t *me) { struct rb_calling_info calling_entry, *calling; struct rb_call_info ci_entry; @@ -206,7 +206,7 @@ vm_call0_body(rb_execution_context_t *ec, struct rb_calling_info *calling, const VALUE rb_vm_call(rb_execution_context_t *ec, VALUE recv, VALUE id, int argc, const VALUE *argv, const rb_callable_method_entry_t *me) { - return vm_call0(ec, recv, id, argc, argv, me); + return rb_vm_call0(ec, recv, id, argc, argv, me); } static inline VALUE @@ -231,7 +231,7 @@ vm_call_super(rb_execution_context_t *ec, int argc, const VALUE *argv) return method_missing(recv, id, argc, argv, MISSING_SUPER); } else { - return vm_call0(ec, recv, id, argc, argv, me); + return rb_vm_call0(ec, recv, id, argc, argv, me); } } @@ -299,7 +299,7 @@ rb_call0(rb_execution_context_t *ec, return method_missing(recv, mid, argc, argv, call_status); } stack_check(ec); - return vm_call0(ec, recv, mid, argc, argv, me); + return rb_vm_call0(ec, recv, mid, argc, argv, me); } struct rescue_funcall_args { @@ -417,7 +417,7 @@ rb_check_funcall_default(VALUE recv, ID mid, int argc, const VALUE *argv, VALUE return ret; } stack_check(ec); - return vm_call0(ec, recv, mid, argc, argv, me); + return rb_vm_call0(ec, recv, mid, argc, argv, me); } VALUE @@ -443,7 +443,7 @@ rb_check_funcall_with_hook(VALUE recv, ID mid, int argc, const VALUE *argv, } stack_check(ec); (*hook)(TRUE, recv, mid, argc, argv, arg); - return vm_call0(ec, recv, mid, argc, argv, me); + return rb_vm_call0(ec, recv, mid, argc, argv, me); } const char * @@ -735,7 +735,7 @@ method_missing(VALUE obj, ID id, int argc, const VALUE *argv, enum method_missin me = rb_callable_method_entry(klass, idMethodMissing); if (!me || METHOD_ENTRY_BASIC(me)) goto missing; vm_passed_block_handler_set(ec, block_handler); - result = vm_call0(ec, obj, idMethodMissing, argc, argv, me); + result = rb_vm_call0(ec, obj, idMethodMissing, argc, argv, me); if (work) ALLOCV_END(work); return result; } -- cgit v1.2.3