summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-28 11:11:17 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-10-28 11:11:17 +0000
commit2317b5da2ae2bab490c91773dad27115d3342bea (patch)
treebcee4f074ee8932693f483f7e63722b42b488009
parent6d803d4391a27708903bbd12fb6fdb3e865c3a8e (diff)
rename a function.
* vm.c (rb_thread_method_id_and_class): rename to rb_ec_frame_method_id_and_class() and accepts `ec` instead of `th`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--vm.c8
-rw-r--r--vm_core.h2
-rw-r--r--vm_trace.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/vm.c b/vm.c
index 45ca3913d5..09d27f347b 100644
--- a/vm.c
+++ b/vm.c
@@ -341,7 +341,7 @@ ruby_th_dtrace_setup(rb_thread_t *th, VALUE klass, ID id,
enum ruby_value_type type;
if (!klass) {
if (!th) th = GET_THREAD();
- if (!rb_thread_method_id_and_class(th, &id, 0, &klass) || !klass)
+ if (!rb_ec_frame_method_id_and_class(th->ec, &id, 0, &klass) || !klass)
return FALSE;
}
if (RB_TYPE_P(klass, T_ICLASS)) {
@@ -2064,15 +2064,15 @@ rb_vm_control_frame_id_and_class(const rb_control_frame_t *cfp, ID *idp, ID *cal
}
int
-rb_thread_method_id_and_class(rb_thread_t *th, ID *idp, ID *called_idp, VALUE *klassp)
+rb_ec_frame_method_id_and_class(const rb_execution_context_t *ec, ID *idp, ID *called_idp, VALUE *klassp)
{
- return rb_vm_control_frame_id_and_class(th->ec->cfp, idp, called_idp, klassp);
+ return rb_vm_control_frame_id_and_class(ec->cfp, idp, called_idp, klassp);
}
int
rb_frame_method_id_and_class(ID *idp, VALUE *klassp)
{
- return rb_thread_method_id_and_class(GET_THREAD(), idp, 0, klassp);
+ return rb_ec_frame_method_id_and_class(GET_EC(), idp, 0, klassp);
}
VALUE
diff --git a/vm_core.h b/vm_core.h
index 0f59880b81..9b785ed206 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -1497,7 +1497,7 @@ RUBY_SYMBOL_EXPORT_END
VALUE rb_iseq_pathobj_new(VALUE path, VALUE realpath);
void rb_iseq_pathobj_set(const rb_iseq_t *iseq, VALUE path, VALUE realpath);
-int rb_thread_method_id_and_class(rb_thread_t *th, ID *idp, ID *called_idp, VALUE *klassp);
+int rb_ec_frame_method_id_and_class(const rb_execution_context_t *ec, ID *idp, ID *called_idp, VALUE *klassp);
VALUE rb_vm_invoke_proc(rb_execution_context_t *ec, rb_proc_t *proc, int argc, const VALUE *argv, VALUE block_handler);
VALUE rb_vm_make_proc_lambda(const rb_execution_context_t *ec, const struct rb_captured_block *captured, VALUE klass, int8_t is_lambda);
diff --git a/vm_trace.c b/vm_trace.c
index 23a6e21a41..41051a5e64 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -598,10 +598,10 @@ call_trace_func(rb_event_flag_t event, VALUE proc, VALUE self, ID id, VALUE klas
VALUE eventname = rb_str_new2(get_event_name(event));
VALUE filename = srcfile ? rb_str_new2(srcfile) : Qnil;
VALUE argv[6];
- rb_thread_t *th = GET_THREAD();
+ const rb_execution_context_t *ec = GET_EC();
if (!klass) {
- rb_thread_method_id_and_class(th, &id, 0, &klass);
+ rb_ec_frame_method_id_and_class(ec, &id, 0, &klass);
}
if (klass) {