summaryrefslogtreecommitdiff
path: root/gc.c
diff options
context:
space:
mode:
authornari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-19 10:18:16 +0000
committernari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-19 10:18:16 +0000
commit87a15a6981b8c44c15667f01914e64add1348a6d (patch)
tree7c6937cac956cb33c75181100d1d5a5b36785d8c /gc.c
parent1efa14169ac0b3f55b9026985095ca256c1315e9 (diff)
revert r34691 and r34689
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gc.c b/gc.c
index c810100ee7..ee7bb84037 100644
--- a/gc.c
+++ b/gc.c
@@ -2622,10 +2622,13 @@ mark_current_machine_context(rb_objspace_t *objspace, rb_thread_t *th)
static void
gc_clear_mark_on_sweep_slots(rb_objspace_t *objspace)
{
+ struct heaps_slot *scan;
+
if (objspace->heap.sweep_slots) {
while (heaps_increment(objspace));
while (objspace->heap.sweep_slots) {
- slot_sweep(objspace, objspace->heap.sweep_slots);
+ scan = objspace->heap.sweep_slots;
+ gc_clear_slot_bits(scan);
objspace->heap.sweep_slots = objspace->heap.sweep_slots->next;
}
}