From 60b7bd2ea3ac0358427a5d344bebdc6225f6c1f2 Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 16 Dec 2013 09:01:49 +0000 Subject: * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep flag in nested case. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ gc.c | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4d65aefa7e..433f8aa375 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Dec 16 18:00:51 2013 Koichi Sasada + + * gc.c (rb_objspace_each_objects): should not clear dont_lazy_sweep + flag in nested case. + Mon Dec 16 16:40:35 2013 Koichi Sasada * vm_method.c (rb_method_entry_make): fix WB miss. diff --git a/gc.c b/gc.c index 7f3304ec59..077f35bd3c 100644 --- a/gc.c +++ b/gc.c @@ -1748,13 +1748,20 @@ rb_objspace_each_objects(each_obj_callback *callback, void *data) { struct each_obj_args args; rb_objspace_t *objspace = &rb_objspace; + int prev_dont_lazy_sweep = objspace->flags.dont_lazy_sweep; gc_rest_sweep(objspace); objspace->flags.dont_lazy_sweep = TRUE; args.callback = callback; args.data = data; - rb_ensure(objspace_each_objects, (VALUE)&args, lazy_sweep_enable, Qnil); + + if (prev_dont_lazy_sweep) { + objspace_each_objects((VALUE)&args); + } + else { + rb_ensure(objspace_each_objects, (VALUE)&args, lazy_sweep_enable, Qnil); + } } struct os_each_struct { -- cgit v1.2.3