diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gc.c | 13 |
2 files changed, 18 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Oct 26 04:01:35 2013 Koichi Sasada <ko1@atdot.net> + + * gc.c (gc_before_heap_sweep): fix freelist management. + After rb_gc_force_recycle() for a object blonging to heap->freelist, + `heap->using_page->freelist' is not null. + Thu Oct 24 21:57:24 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> * parse.y: Remove +(binary) and -(binary) special cases @@ -2483,7 +2483,18 @@ gc_before_heap_sweep(rb_objspace_t *objspace, rb_heap_t *heap) heap->free_pages = NULL; if (heap->using_page) { - heap->using_page->freelist = heap->freelist; + if (heap->using_page->freelist) { + RVALUE *pstart = heap->using_page->freelist; + RVALUE *p = heap->using_page->freelist; + while (p->as.free.next) { + p = p->as.free.next; + } + p->as.free.next = heap->freelist; + heap->using_page->freelist = pstart; + } + else { + heap->using_page->freelist = heap->freelist; + } heap->using_page = NULL; } heap->freelist = NULL; |