summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-29 14:52:05 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-29 14:52:05 +0000
commitcf28dbc5431900bdc9a8d11e8f9f68b421c83dfd (patch)
tree07df56ffe718f6acb7ba57bc29218c0a3fc71997
parent2ffa4d23941e22379fe5ade55f2541bdb807ca64 (diff)
`th` -> `ec` for rb_raise_method_missing().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--eval_intern.h4
-rw-r--r--vm_eval.c16
-rw-r--r--vm_insnhelper.c2
3 files changed, 11 insertions, 11 deletions
diff --git a/eval_intern.h b/eval_intern.h
index d221eca5b7..6eadc0da19 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -302,8 +302,8 @@ NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
#if 0
NORETURN(void rb_vm_jump_tag_but_local_jump(int));
#endif
-NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
- VALUE obj, int call_status));
+NORETURN(void rb_raise_method_missing(rb_execution_context_t *ec,
+ int argc, const VALUE *argv, VALUE obj, int call_status));
VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val);
rb_cref_t *rb_vm_cref(void);
diff --git a/vm_eval.c b/vm_eval.c
index 66463bd863..2a3211d9f1 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -591,7 +591,7 @@ rb_call(VALUE recv, ID mid, int argc, const VALUE *argv, call_type scope)
return rb_call0(ec, recv, mid, argc, argv, scope, ec->cfp->self);
}
-NORETURN(static void raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
+NORETURN(static void raise_method_missing(rb_execution_context_t *ec, int argc, const VALUE *argv,
VALUE obj, enum method_missing_reason call_status));
/*
@@ -631,7 +631,7 @@ static VALUE
rb_method_missing(int argc, const VALUE *argv, VALUE obj)
{
rb_thread_t *th = GET_THREAD();
- raise_method_missing(th, argc, argv, obj, th->method_missing_reason);
+ raise_method_missing(th->ec, argc, argv, obj, th->method_missing_reason);
UNREACHABLE;
}
@@ -662,7 +662,7 @@ make_no_method_exception(VALUE exc, VALUE format, VALUE obj,
}
static void
-raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, VALUE obj,
+raise_method_missing(rb_execution_context_t *ec, int argc, const VALUE *argv, VALUE obj,
enum method_missing_reason last_call_status)
{
VALUE exc = rb_eNoMethodError;
@@ -677,7 +677,7 @@ raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv, VALUE obj,
rb_obj_class(argv[0]));
}
- stack_check(th->ec);
+ stack_check(ec);
if (last_call_status & MISSING_PRIVATE) {
format = rb_fstring_cstr("private method `%s' called for %s%s%s");
@@ -715,7 +715,7 @@ method_missing(VALUE obj, ID id, int argc, const VALUE *argv, enum method_missin
if (id == idMethodMissing) {
missing:
- raise_method_missing(rb_ec_thread_ptr(ec), argc, argv, obj, call_status | MISSING_MISSING);
+ raise_method_missing(ec, argc, argv, obj, call_status | MISSING_MISSING);
}
nargv = ALLOCV_N(VALUE, work, argc + 1);
@@ -735,11 +735,11 @@ method_missing(VALUE obj, ID id, int argc, const VALUE *argv, enum method_missin
}
void
-rb_raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
+rb_raise_method_missing(rb_execution_context_t *ec, int argc, const VALUE *argv,
VALUE obj, int call_status)
{
- vm_passed_block_handler_set(th->ec, VM_BLOCK_HANDLER_NONE);
- raise_method_missing(th, argc, argv, obj, call_status | MISSING_MISSING);
+ vm_passed_block_handler_set(ec, VM_BLOCK_HANDLER_NONE);
+ raise_method_missing(ec, argc, argv, obj, call_status | MISSING_MISSING);
}
/*!
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 6d82b1cc01..a518f30039 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -2339,7 +2339,7 @@ vm_call_method_nome(rb_execution_context_t *ec, rb_control_frame_t *cfp, struct
if (ci->mid == idMethodMissing) {
rb_control_frame_t *reg_cfp = cfp;
VALUE *argv = STACK_ADDR_FROM_TOP(calling->argc);
- rb_raise_method_missing(rb_ec_thread_ptr(ec), calling->argc, argv, calling->recv, stat);
+ rb_raise_method_missing(ec, calling->argc, argv, calling->recv, stat);
}
else {
cc->aux.method_missing_reason = stat;