aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--gc.c5
2 files changed, 4 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 29351f15f8..023ef003bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,16 +3,6 @@ Sun Feb 19 17:07:27 2012 Tanaka Akira <akr@fsij.org>
* test/dbm/test_dbm.rb (test_dbmfile_suffix): check pag and dir is
empty for 4.3BSD ndbm.
-Sun Feb 19 13:08:34 2012 Narihiro Nakamura <authornari@gmail.com>
-
- * gc.c (gc_clear_mark_on_sweep_slots): remove a unused variable.
-
-Sun Feb 19 11:53:35 2012 Narihiro Nakamura <authornari@gmail.com>
-
- * gc.c (gc_clear_mark_on_sweep_slots): uses slot_sweep() for
- unsweeped slots, because some dead objects might be marked in
- next the mark phase by false pointers. [ruby-core:42672]
-
Sun Feb 19 03:00:30 2012 Tanaka Akira <akr@fsij.org>
* test/dbm/test_dbm.rb (test_dbmfile_suffix): check magic numbers.
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;
}
}