From a64801c1e95e127ad47de1d6d8fdb3f3390a9687 Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 23 Jun 2017 08:48:41 +0000 Subject: rename th->state to th->tag_state. * vm_core.h (rb_thread_t): rename rb_thread_t::state to tag_state to make it clear. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_trace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vm_trace.c') diff --git a/vm_trace.c b/vm_trace.c index 28b067e4a2..d9997ec9cd 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -329,12 +329,12 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p) if (th->trace_arg == 0 && /* check reentrant */ trace_arg->self != rb_mRubyVMFrozenCore /* skip special methods. TODO: remove it. */) { const VALUE errinfo = th->errinfo; - const enum ruby_tag_type outer_state = th->state; + const enum ruby_tag_type outer_state = th->tag_state; const VALUE old_recursive = th->local_storage_recursive_hash; int state = 0; th->local_storage_recursive_hash = th->local_storage_recursive_hash_for_trace; - th->state = TAG_NONE; + th->tag_state = TAG_NONE; th->errinfo = Qnil; th->vm->trace_running++; @@ -366,7 +366,7 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p) } TH_JUMP_TAG(th, state); } - th->state = outer_state; + th->tag_state = outer_state; } } } @@ -399,8 +399,8 @@ rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg) if (!th->trace_arg) th->trace_arg = &dummy_trace_arg; raised = rb_threadptr_reset_raised(th); - outer_state = th->state; - th->state = TAG_NONE; + outer_state = th->tag_state; + th->tag_state = TAG_NONE; TH_PUSH_TAG(th); if ((state = TH_EXEC_TAG()) == TAG_NONE) { @@ -419,7 +419,7 @@ rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg) TH_JUMP_TAG(th, state); } - th->state = outer_state; + th->tag_state = outer_state; return result; } -- cgit v1.2.3