aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--iseq.c31
-rw-r--r--proc.c12
-rw-r--r--vm.c98
-rw-r--r--vm_trace.c8
5 files changed, 79 insertions, 77 deletions
diff --git a/ChangeLog b/ChangeLog
index be1936dbea..6958b0da17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 15 17:27:40 2015 Eric Wong <e@80x24.org>
+
+ * 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
+
Wed Jul 15 16:55:04 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_autoload): drop dummy encoding flag from
diff --git a/iseq.c b/iseq.c
index e8318b9233..a42eae8e3c 100644
--- a/iseq.c
+++ b/iseq.c
@@ -102,27 +102,26 @@ iseq_free(void *ptr)
static void
iseq_mark(void *ptr)
{
- RUBY_MARK_ENTER("iseq");
+ rb_iseq_t *iseq = ptr;
- if (ptr) {
- rb_iseq_t *iseq = ptr;
+ RUBY_MARK_ENTER("iseq");
- RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->location.label), RSTRING_PTR(iseq->location.path));
+ RUBY_GC_INFO("%s @ %s\n", RSTRING_PTR(iseq->location.label), RSTRING_PTR(iseq->location.path));
- RUBY_MARK_UNLESS_NULL(iseq->mark_ary);
- RUBY_MARK_UNLESS_NULL(iseq->location.label);
- RUBY_MARK_UNLESS_NULL(iseq->location.base_label);
- RUBY_MARK_UNLESS_NULL(iseq->location.path);
- RUBY_MARK_UNLESS_NULL(iseq->location.absolute_path);
- RUBY_MARK_UNLESS_NULL(iseq->coverage);
+ RUBY_MARK_UNLESS_NULL(iseq->mark_ary);
+ RUBY_MARK_UNLESS_NULL(iseq->location.label);
+ RUBY_MARK_UNLESS_NULL(iseq->location.base_label);
+ RUBY_MARK_UNLESS_NULL(iseq->location.path);
+ RUBY_MARK_UNLESS_NULL(iseq->location.absolute_path);
+ RUBY_MARK_UNLESS_NULL(iseq->coverage);
- if (iseq->compile_data != 0) {
- struct iseq_compile_data *const compile_data = iseq->compile_data;
- RUBY_MARK_UNLESS_NULL(compile_data->mark_ary);
- RUBY_MARK_UNLESS_NULL(compile_data->err_info);
- RUBY_MARK_UNLESS_NULL(compile_data->catch_table_ary);
- }
+ if (iseq->compile_data != 0) {
+ struct iseq_compile_data *const compile_data = iseq->compile_data;
+ RUBY_MARK_UNLESS_NULL(compile_data->mark_ary);
+ RUBY_MARK_UNLESS_NULL(compile_data->err_info);
+ RUBY_MARK_UNLESS_NULL(compile_data->catch_table_ary);
}
+
RUBY_MARK_LEAVE("iseq");
}
diff --git a/proc.c b/proc.c
index f1fd3cea24..1e8c117ff1 100644
--- a/proc.c
+++ b/proc.c
@@ -243,13 +243,13 @@ binding_free(void *ptr)
static void
binding_mark(void *ptr)
{
- rb_binding_t *bind;
+ rb_binding_t *bind = ptr;
+
RUBY_MARK_ENTER("binding");
- if (ptr) {
- bind = ptr;
- RUBY_MARK_UNLESS_NULL(bind->env);
- RUBY_MARK_UNLESS_NULL(bind->path);
- }
+
+ RUBY_MARK_UNLESS_NULL(bind->env);
+ RUBY_MARK_UNLESS_NULL(bind->path);
+
RUBY_MARK_LEAVE("binding");
}
diff --git a/vm.c b/vm.c
index 918db2de11..b2b87f8eb5 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");
}
diff --git a/vm_trace.c b/vm_trace.c
index cec0deecb0..b46437038c 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -653,11 +653,9 @@ typedef struct rb_tp_struct {
static void
tp_mark(void *ptr)
{
- if (ptr) {
- rb_tp_t *tp = (rb_tp_t *)ptr;
- rb_gc_mark(tp->proc);
- if (tp->target_th) rb_gc_mark(tp->target_th->self);
- }
+ rb_tp_t *tp = ptr;
+ rb_gc_mark(tp->proc);
+ if (tp->target_th) rb_gc_mark(tp->target_th->self);
}
static size_t
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-24 07:50:36 +0000