From 157401a9a1c921ebd5c77e23cd10fd90c1d3e26f Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 18 Apr 2016 08:15:33 +0000 Subject: merge revision(s) 54484: [Backport #12095] * vm_core.h (rb_vm_struct): make at_exit a single linked list but not RArray, not to mark the registered functions by the write barrier. based on the patches by Evan Phoenix. [ruby-core:73908] [Bug #12095] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_core.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'vm_core.h') diff --git a/vm_core.h b/vm_core.h index 38fcc0c333..67a9f00be6 100644 --- a/vm_core.h +++ b/vm_core.h @@ -459,6 +459,14 @@ enum ruby_basic_operators { #define GetVMPtr(obj, ptr) \ GetCoreDataFromValue((obj), rb_vm_t, (ptr)) +struct rb_vm_struct; +typedef void rb_vm_at_exit_func(struct rb_vm_struct*); + +typedef struct rb_at_exit_list { + rb_vm_at_exit_func *func; + struct rb_at_exit_list *next; +} rb_at_exit_list; + struct rb_objspace; struct rb_objspace *rb_objspace_alloc(void); void rb_objspace_free(struct rb_objspace *); @@ -527,11 +535,7 @@ typedef struct rb_vm_struct { struct rb_objspace *objspace; - /* - * @shyouhei notes that this is not for storing normal Ruby - * objects so do *NOT* mark this when you GC. - */ - struct RArray at_exit; + rb_at_exit_list *at_exit; VALUE *defined_strings; st_table *frozen_strings; -- cgit v1.2.3