Permalink
Browse files

revert r34691 and r34689

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 1efa141 commit 87a15a6981b8c44c15667f01914e64add1348a6d @authorNari authorNari committed Feb 19, 2012
Showing with 4 additions and 11 deletions.
  1. +0 −10 ChangeLog
  2. +4 −1 gc.c
View
@@ -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.
View
5 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;
}
}

0 comments on commit 87a15a6

Please sign in to comment.