mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* iseq.c (iseq_mark): skip some marking if iseq->orig is available.
* iseq.c (rb_iseq_clone): need WB for iseq1->klass = iseq0->klass (done in MEMCPY). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
05704f51fb
commit
4690e62284
2 changed files with 22 additions and 8 deletions
|
@ -1,3 +1,10 @@
|
|||
Thu Mar 19 05:30:13 2015 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* iseq.c (iseq_mark): skip some marking if iseq->orig is available.
|
||||
|
||||
* iseq.c (rb_iseq_clone): need WB for iseq1->klass = iseq0->klass
|
||||
(done in MEMCPY).
|
||||
|
||||
Thu Mar 19 04:55:53 2015 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* internal.h (IMEMO_DEBUG): added.
|
||||
|
|
23
iseq.c
23
iseq.c
|
@ -114,16 +114,20 @@ iseq_mark(void *ptr)
|
|||
rb_iseq_t *iseq = ptr;
|
||||
|
||||
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);
|
||||
if (!iseq->orig) {
|
||||
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);
|
||||
}
|
||||
else {
|
||||
RUBY_MARK_UNLESS_NULL(iseq->orig);
|
||||
}
|
||||
|
||||
RUBY_MARK_UNLESS_NULL(iseq->klass);
|
||||
RUBY_MARK_UNLESS_NULL(iseq->coverage);
|
||||
RUBY_MARK_UNLESS_NULL(iseq->orig);
|
||||
|
||||
if (iseq->compile_data != 0) {
|
||||
struct iseq_compile_data *const compile_data = iseq->compile_data;
|
||||
|
@ -1946,7 +1950,7 @@ rb_iseq_clone(VALUE iseqval, VALUE newcbase)
|
|||
GetISeqPtr(iseqval, iseq0);
|
||||
GetISeqPtr(newiseq, iseq1);
|
||||
|
||||
MEMCPY(iseq1, iseq0, rb_iseq_t, 1); /* TODO: write barrier? */
|
||||
MEMCPY(iseq1, iseq0, rb_iseq_t, 1);
|
||||
|
||||
iseq1->self = newiseq;
|
||||
if (!iseq1->orig) {
|
||||
|
@ -1959,6 +1963,9 @@ rb_iseq_clone(VALUE iseqval, VALUE newcbase)
|
|||
if (newcbase) {
|
||||
RB_OBJ_WRITE(iseq1->self, &iseq1->klass, newcbase);
|
||||
}
|
||||
else {
|
||||
RB_OBJ_WRITTEN(iseq1->self, Qundef, iseq1->klass);
|
||||
}
|
||||
|
||||
return newiseq;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue