diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | iseq.c | 4 | ||||
| -rw-r--r-- | vm_insnhelper.c | 4 | ||||
| -rw-r--r-- | vm_insnhelper.h | 6 |
4 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,11 @@ +Sat May 16 17:26:04 2009 Narihiro Nakamura <authorNari@gmail.com> + + * iseq.c (rb_iseq_clone): use longlife object and insert write barrier. + + * vm_insnhelper.c (vm_cref_push): ditto. + + * vm_insnhelper.h (COPY_CREF): insert write barrier. + Sat May 16 13:49:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * variable.c (rb_autoload_load): gets rid of false warning. @@ -1285,9 +1285,9 @@ rb_iseq_clone(VALUE iseqval, VALUE newcbase) iseq1->orig = iseqval; } if (newcbase) { - iseq1->cref_stack = NEW_BLOCK(newcbase); + iseq1->cref_stack = NEW_NODE_LONGLIFE(NODE_BLOCK, newcbase, 0, 0); if (iseq0->cref_stack->nd_next) { - iseq1->cref_stack->nd_next = iseq0->cref_stack->nd_next; + iseq1->cref_stack->nd_next = (NODE *)rb_gc_write_barrier((VALUE)iseq0->cref_stack->nd_next); } } diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 13bbcf799b..0889e8aee9 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1032,12 +1032,12 @@ static NODE * vm_cref_push(rb_thread_t *th, VALUE klass, int noex) { rb_control_frame_t *cfp = vm_get_ruby_level_caller_cfp(th, th->cfp); - NODE *cref = NEW_BLOCK(klass); + NODE *cref = NEW_NODE_LONGLIFE(NODE_BLOCK, klass, 0, 0); cref->nd_file = 0; cref->nd_visi = noex; if (cfp) { - cref->nd_next = vm_get_cref(cfp->iseq, cfp->lfp, cfp->dfp); + cref->nd_next = (NODE *)rb_gc_write_barrier((VALUE)vm_get_cref(cfp->iseq, cfp->lfp, cfp->dfp)); } return cref; diff --git a/vm_insnhelper.h b/vm_insnhelper.h index 74ca8450e4..838a652672 100644 --- a/vm_insnhelper.h +++ b/vm_insnhelper.h @@ -154,9 +154,9 @@ extern VALUE ruby_vm_const_missing_count; #define COPY_CREF(c1, c2) do { \ NODE *__tmp_c2 = (c2); \ - c1->nd_clss = __tmp_c2->nd_clss; \ - c1->nd_visi = __tmp_c2->nd_visi; \ - c1->nd_next = __tmp_c2->nd_next; \ + c1->nd_clss = rb_gc_write_barrier((VALUE)__tmp_c2->nd_clss);\ + c1->nd_visi = __tmp_c2->nd_visi;\ + c1->nd_next = (NODE *)rb_gc_write_barrier((VALUE)__tmp_c2->nd_next);\ } while (0) #define CALL_METHOD(num, blockptr, flag, id, mn, recv) do { \ |