From 97f0de6d90d9e804386f708172b5a75c277cb38c Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 29 Oct 2013 07:25:45 +0000 Subject: * gc.c (heap_page_resurrect): return a page in tomb heap even if freelist is NULL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ gc.c | 14 ++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4267ad771f..d0c0e39352 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 29 16:24:52 2013 Koichi Sasada + + * gc.c (heap_page_resurrect): return a page in tomb heap even if + freelist is NULL. + Tue Oct 29 15:46:30 2013 Nobuyoshi Nakada * ruby_atomic.h (ATOMIC_SIZE_CAS): new macro, compare and swap size_t. diff --git a/gc.c b/gc.c index a570ae3810..f3f6d62c4b 100644 --- a/gc.c +++ b/gc.c @@ -936,17 +936,11 @@ heap_page_resurrect(rb_objspace_t *objspace) { struct heap_page *page; - if (heap_tomb->pages) { - page = heap_tomb->pages; - while (page) { - if (page->freelist) { - heap_unlink_page(objspace, heap_tomb, page); - return page; - } - page = page->next; - } + if ((page = heap_tomb->pages) != NULL) { + heap_unlink_page(objspace, heap_tomb, page); + return page; } - return 0; + return NULL; } static struct heap_page * -- cgit v1.2.3