1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* iseq.c (rb_iseq_clone): use longlife object and insert write barrier.

Browse Source 
* vm_insnhelper.c (vm_cref_push): ditto.

* vm_insnhelper.h (COPY_CREF): insert write barrier.
			


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nari 2009-05-16 08:27:36 +00:00
parent 8c7172605b
commit 832d5a8329
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> Sat May 16 13:49:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* variable.c (rb_autoload_load): gets rid of false warning. * variable.c (rb_autoload_load): gets rid of false warning.

4
iseq.c
View File

@ -1285,9 +1285,9 @@ rb_iseq_clone(VALUE iseqval, VALUE newcbase)
iseq1->orig = iseqval; iseq1->orig = iseqval;
} }
if (newcbase) { 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) { 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);
} }
} }

4
vm_insnhelper.c
View File

@ -1032,12 +1032,12 @@ static NODE *
vm_cref_push(rb_thread_t *th, VALUE klass, int noex) 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); 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_file = 0;
cref->nd_visi = noex; cref->nd_visi = noex;
if (cfp) { 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; return cref;

6
vm_insnhelper.h
View File

@ -154,9 +154,9 @@ extern VALUE ruby_vm_const_missing_count;
#define COPY_CREF(c1, c2) do { \ #define COPY_CREF(c1, c2) do { \
NODE *__tmp_c2 = (c2); \ NODE *__tmp_c2 = (c2); \
c1->nd_clss = __tmp_c2->nd_clss; \ c1->nd_clss = rb_gc_write_barrier((VALUE)__tmp_c2->nd_clss);\
c1->nd_visi = __tmp_c2->nd_visi; \ c1->nd_visi = __tmp_c2->nd_visi;\
c1->nd_next = __tmp_c2->nd_next; \ c1->nd_next = (NODE *)rb_gc_write_barrier((VALUE)__tmp_c2->nd_next);\
} while (0) } while (0)
#define CALL_METHOD(num, blockptr, flag, id, mn, recv) do { \ #define CALL_METHOD(num, blockptr, flag, id, mn, recv) do { \