kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* gc.c (gc_mark_roots): call rb_vm_mark directly.

Browse source 
* vm.c: remove mark function for RubyVM object because
  RubyVM object marked manually.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2014-07-16 09:06:52 +00:00
parent 64c81e40d4
commit 88722e6a5d
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Jul 16 18:03:50 2014 Koichi Sasada <ko1@atdot.net>
* gc.c (gc_mark_roots): call rb_vm_mark directly.
* vm.c: remove mark function for RubyVM object because
RubyVM object marked manually.
Wed Jul 16 12:25:39 2014 NARUSE, Yui <naruse@ruby-lang.org> Wed Jul 16 12:25:39 2014 NARUSE, Yui <naruse@ruby-lang.org>
* regcomp.c: Merge Onigmo 5.14.1 25a8a69fc05ae3b56a09. * regcomp.c: Merge Onigmo 5.14.1 25a8a69fc05ae3b56a09.

3
gc.c
View file

@ -4222,7 +4222,8 @@ gc_mark_roots(rb_objspace_t *objspace, int full_mark, const char **categoryp)
MARK_CHECKPOINT("vm"); MARK_CHECKPOINT("vm");
SET_STACK_END; SET_STACK_END;
th->vm->self ? rb_gc_mark(th->vm->self) : rb_vm_mark(th->vm); rb_vm_mark(th->vm);
if (th->vm->self) gc_mark_ptr(objspace, th->vm->self);
MARK_CHECKPOINT("finalizers"); MARK_CHECKPOINT("finalizers");
mark_tbl(objspace, finalizer_table); mark_tbl(objspace, finalizer_table);

4
vm.c
View file

@ -1790,8 +1790,6 @@ rb_vm_add_root_module(ID id, VALUE module)
return TRUE; return TRUE;
} }
#define vm_free 0
int int
ruby_vm_destruct(rb_vm_t *vm) ruby_vm_destruct(rb_vm_t *vm)
{ {
@ -1844,7 +1842,7 @@ vm_memsize(const void *ptr)
static const rb_data_type_t vm_data_type = { static const rb_data_type_t vm_data_type = {
"VM", "VM",
{rb_vm_mark, vm_free, vm_memsize,}, {NULL, NULL, vm_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
}; };