diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-16 09:09:40 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-16 09:09:40 +0000 |
commit | 20a9bd67636a82ca83c5cef4755a8206dc34eca7 (patch) | |
tree | d405c50b1c7da8e33969ff1b88881c32e8d48f91 | |
parent | 88722e6a5dc9881e7d4a54e4cd90f5b4ebbb609c (diff) | |
download | ruby-20a9bd67636a82ca83c5cef4755a8206dc34eca7.tar.gz |
* iseq.c (rb_iseq_defined_string): use rb_gc_mark_object() instead of
marking from vm_mark().
* vm.c (rb_vm_mark): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | iseq.c | 1 | ||||
-rw-r--r-- | vm.c | 3 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Wed Jul 16 18:08:47 2014 Koichi Sasada <ko1@atdot.net> + + * iseq.c (rb_iseq_defined_string): use rb_gc_mark_object() instead of + marking from vm_mark(). + + * vm.c (rb_vm_mark): ditto. + Wed Jul 16 18:03:50 2014 Koichi Sasada <ko1@atdot.net> * gc.c (gc_mark_roots): call rb_vm_mark directly. @@ -2069,6 +2069,7 @@ rb_iseq_defined_string(enum defined_type type) str = rb_str_new_cstr(estr);; OBJ_FREEZE(str); defs[type-1] = str; + rb_gc_register_mark_object(str); } return str; } @@ -1771,9 +1771,6 @@ rb_vm_mark(void *ptr) if (vm->trap_list[i].cmd) rb_gc_mark(vm->trap_list[i].cmd); } - if (vm->defined_strings) { - rb_gc_mark_locations(vm->defined_strings, vm->defined_strings + DEFINED_EXPR); - } } RUBY_MARK_LEAVE("vm"); |