summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-24 15:17:08 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-24 15:17:08 +0000
commitba8413c27cc6dd36f2f54f51a17aae47ee482178 (patch)
tree43bb97a85cb0b82e62a14ba15aba750286dbea83 /vm.c
parent63f51f528312c1c534bdc8418520299781145e6a (diff)
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.c')
-rw-r--r--vm.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/vm.c b/vm.c
index cc01002..c67ace1 100644
--- a/vm.c
+++ b/vm.c
@@ -12,10 +12,7 @@
#include "ruby/vm.h"
#include "ruby/st.h"
-#define vm_call0 rb_vm_call0
#define vm_exec rb_vm_exec
-#define vm_invoke_bmethod rb_vm_invoke_bmethod
-#define vm_search_method_slowpath rb_vm_search_method_slowpath
#include "gc.h"
#include "vm_core.h"
@@ -302,7 +299,7 @@ static void vm_collect_usage_register(int reg, int isset);
#endif
static VALUE vm_make_env_object(const rb_execution_context_t *ec, rb_control_frame_t *cfp);
-extern VALUE vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self, int argc, const VALUE *argv, VALUE block_handler);
+extern VALUE rb_vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self, int argc, const VALUE *argv, VALUE block_handler);
static VALUE vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self, int argc, const VALUE *argv, VALUE block_handler);
static VALUE rb_block_param_proxy;
@@ -1173,7 +1170,7 @@ vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
}
MJIT_FUNC_EXPORTED VALUE
-vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
+rb_vm_invoke_bmethod(rb_execution_context_t *ec, rb_proc_t *proc, VALUE self,
int argc, const VALUE *argv, VALUE block_handler)
{
return invoke_block_from_c_proc(ec, proc, self, argc, argv, block_handler, TRUE);
@@ -1187,7 +1184,7 @@ rb_vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc,
vm_block_handler_verify(passed_block_handler);
if (proc->is_from_method) {
- return vm_invoke_bmethod(ec, proc, self, argc, argv, passed_block_handler);
+ return rb_vm_invoke_bmethod(ec, proc, self, argc, argv, passed_block_handler);
}
else {
return vm_invoke_proc(ec, proc, self, argc, argv, passed_block_handler);