diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | gc.c | 14 | ||||
| -rw-r--r-- | internal.h | 2 | ||||
| -rw-r--r-- | string.c | 2 |
4 files changed, 28 insertions, 1 deletions
@@ -1,3 +1,14 @@ +Tue Nov 19 18:45:40 2013 Koichi Sasada <ko1@atdot.net> + + * gc.c (rb_gc_resurrect): added. + rb_fstring() used rb_gc_mark() to avoid freeing used string. + However, rb_gc_mark() set mark bit *and* pushes mark_stack. + rb_gc_resurrect() does only set mark bit if it is before sweeping. + + * string.c (rb_fstring): use rb_gc_resurrect. + + * internal.h: add decl. + Tue Nov 19 09:47:02 2013 Eric Hodel <drbrain@segment7.net> * lib/rdoc: Update to RDoc master a1195ce. Changes include: @@ -3571,6 +3571,20 @@ rb_gc_mark(VALUE ptr) gc_mark(&rb_objspace, ptr); } +/* resurrect non-marked `obj' if obj is before swept */ + +void +rb_gc_resurrect(VALUE obj) +{ + rb_objspace_t *objspace = &rb_objspace; + + if (is_lazy_sweeping(heap_eden) && + !gc_marked(objspace, obj) && + !is_swept_object(objspace, obj)) { + gc_mark_ptr(objspace, obj); + } +} + static void gc_mark_children(rb_objspace_t *objspace, VALUE ptr) { diff --git a/internal.h b/internal.h index cd2177afef..05bbbc74c8 100644 --- a/internal.h +++ b/internal.h @@ -435,6 +435,8 @@ void *ruby_sized_xrealloc(void *ptr, size_t new_size, size_t old_size) RUBY_ATTR void ruby_sized_xfree(void *x, size_t size); #define SIZED_REALLOC_N(var,type,n,old_n) ((var)=(type*)ruby_sized_xrealloc((char*)(var), (n) * sizeof(type), (old_n) * sizeof(type))) +void rb_gc_resurrect(VALUE ptr); + /* hash.c */ struct st_table *rb_hash_tbl_raw(VALUE hash); #define RHASH_TBL_RAW(h) rb_hash_tbl_raw(h) @@ -140,7 +140,7 @@ rb_fstring(VALUE str) str = (VALUE)fstr; /* because of lazy sweep, str may be unmaked already and swept * at next time */ - rb_gc_mark(str); + rb_gc_resurrect(str); } else { str = rb_str_new_frozen(str); |