diff options
-rw-r--r-- | vm.c | 8 | ||||
-rw-r--r-- | vm_core.h | 2 | ||||
-rw-r--r-- | vm_trace.c | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -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 @@ -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) { |