summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-15 08:29:22 (GMT)
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-15 08:29:22 (GMT)
commita0908cb41356f4384a3e9a199c14490a452080ef (patch)
treed39f8594878553632d951423d22bc2542d4ffd06 /vm.c
parent28c42b4c25c48f65cd559018678a5cf34d387c24 (diff)
remove redundant NULL check in mark functions
gc.c (gc_mark_children)only calls mark_func if the T_DATA ptr is non-NULL, so avoid redundantly checking for that in each mark function. * iseq.c (iseq_mark): remove check for data pointer * proc.c (binding_mark): ditto * vm.c (rb_thread_mark): ditto * vm_trace.c (tp_mark): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c98
1 files changed, 48 insertions, 50 deletions
diff --git a/vm.c b/vm.c
index 918db2d..b2b87f8 100644
--- a/vm.c
+++ b/vm.c
@@ -2053,64 +2053,62 @@ void rb_fiber_mark_self(rb_fiber_t *fib);
void
rb_thread_mark(void *ptr)
{
- rb_thread_t *th = NULL;
+ rb_thread_t *th = ptr;
RUBY_MARK_ENTER("thread");
- if (ptr) {
- th = ptr;
- if (th->stack) {
- VALUE *p = th->stack;
- VALUE *sp = th->cfp->sp;
- rb_control_frame_t *cfp = th->cfp;
- rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size);
-
- rb_gc_mark_values((long)(sp - p), p);
-
- while (cfp != limit_cfp) {
- rb_iseq_t *iseq = cfp->iseq;
- rb_gc_mark(cfp->proc);
- rb_gc_mark(cfp->self);
- if (iseq) {
- rb_gc_mark(RUBY_VM_NORMAL_ISEQ_P(iseq) ? iseq->self : (VALUE)iseq);
- }
- cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
+
+ if (th->stack) {
+ VALUE *p = th->stack;
+ VALUE *sp = th->cfp->sp;
+ rb_control_frame_t *cfp = th->cfp;
+ rb_control_frame_t *limit_cfp = (void *)(th->stack + th->stack_size);
+
+ rb_gc_mark_values((long)(sp - p), p);
+
+ while (cfp != limit_cfp) {
+ rb_iseq_t *iseq = cfp->iseq;
+ rb_gc_mark(cfp->proc);
+ rb_gc_mark(cfp->self);
+ if (iseq) {
+ rb_gc_mark(RUBY_VM_NORMAL_ISEQ_P(iseq) ? iseq->self : (VALUE)iseq);
}
+ cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
}
+ }
- /* mark ruby objects */
- RUBY_MARK_UNLESS_NULL(th->first_proc);
- if (th->first_proc) RUBY_MARK_UNLESS_NULL(th->first_args);
-
- RUBY_MARK_UNLESS_NULL(th->thgroup);
- RUBY_MARK_UNLESS_NULL(th->value);
- RUBY_MARK_UNLESS_NULL(th->errinfo);
- RUBY_MARK_UNLESS_NULL(th->pending_interrupt_queue);
- RUBY_MARK_UNLESS_NULL(th->pending_interrupt_mask_stack);
- RUBY_MARK_UNLESS_NULL(th->root_svar);
- RUBY_MARK_UNLESS_NULL(th->top_self);
- RUBY_MARK_UNLESS_NULL(th->top_wrapper);
- rb_fiber_mark_self(th->fiber);
- rb_fiber_mark_self(th->root_fiber);
- RUBY_MARK_UNLESS_NULL(th->stat_insn_usage);
- RUBY_MARK_UNLESS_NULL(th->last_status);
-
- RUBY_MARK_UNLESS_NULL(th->locking_mutex);
-
- rb_mark_tbl(th->local_storage);
- RUBY_MARK_UNLESS_NULL(th->local_storage_recursive_hash);
- RUBY_MARK_UNLESS_NULL(th->local_storage_recursive_hash_for_trace);
-
- if (GET_THREAD() != th && th->machine.stack_start && th->machine.stack_end) {
- rb_gc_mark_machine_stack(th);
- rb_gc_mark_locations((VALUE *)&th->machine.regs,
- (VALUE *)(&th->machine.regs) +
- sizeof(th->machine.regs) / sizeof(VALUE));
- }
+ /* mark ruby objects */
+ RUBY_MARK_UNLESS_NULL(th->first_proc);
+ if (th->first_proc) RUBY_MARK_UNLESS_NULL(th->first_args);
+
+ RUBY_MARK_UNLESS_NULL(th->thgroup);
+ RUBY_MARK_UNLESS_NULL(th->value);
+ RUBY_MARK_UNLESS_NULL(th->errinfo);
+ RUBY_MARK_UNLESS_NULL(th->pending_interrupt_queue);
+ RUBY_MARK_UNLESS_NULL(th->pending_interrupt_mask_stack);
+ RUBY_MARK_UNLESS_NULL(th->root_svar);
+ RUBY_MARK_UNLESS_NULL(th->top_self);
+ RUBY_MARK_UNLESS_NULL(th->top_wrapper);
+ rb_fiber_mark_self(th->fiber);
+ rb_fiber_mark_self(th->root_fiber);
+ RUBY_MARK_UNLESS_NULL(th->stat_insn_usage);
+ RUBY_MARK_UNLESS_NULL(th->last_status);
- RUBY_MARK_UNLESS_NULL(th->name);
+ RUBY_MARK_UNLESS_NULL(th->locking_mutex);
- rb_vm_trace_mark_event_hooks(&th->event_hooks);
+ rb_mark_tbl(th->local_storage);
+ RUBY_MARK_UNLESS_NULL(th->local_storage_recursive_hash);
+ RUBY_MARK_UNLESS_NULL(th->local_storage_recursive_hash_for_trace);
+
+ if (GET_THREAD() != th && th->machine.stack_start && th->machine.stack_end) {
+ rb_gc_mark_machine_stack(th);
+ rb_gc_mark_locations((VALUE *)&th->machine.regs,
+ (VALUE *)(&th->machine.regs) +
+ sizeof(th->machine.regs) / sizeof(VALUE));
}
+ RUBY_MARK_UNLESS_NULL(th->name);
+
+ rb_vm_trace_mark_event_hooks(&th->event_hooks);
+
RUBY_MARK_LEAVE("thread");
}