ruby-changes:22646
From: nari <ko1@a...>
Date: Sun, 19 Feb 2012 19:18:29 +0900 (JST)
Subject: [ruby-changes:22646] nari:r34695 (trunk): revert r34691 and r34689
nari 2012-02-19 19:18:16 +0900 (Sun, 19 Feb 2012) New Revision: 34695 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34695 Log: revert r34691 and r34689 Modified files: trunk/ChangeLog trunk/gc.c Index: ChangeLog =================================================================== --- ChangeLog (revision 34694) +++ ChangeLog (revision 34695) @@ -3,16 +3,6 @@ * 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@g...> - - * gc.c (gc_clear_mark_on_sweep_slots): remove a unused variable. - -Sun Feb 19 11:53:35 2012 Narihiro Nakamura <authornari@g...> - - * 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@f...> * test/dbm/test_dbm.rb (test_dbmfile_suffix): check magic numbers. Index: gc.c =================================================================== --- gc.c (revision 34694) +++ gc.c (revision 34695) @@ -2622,10 +2622,13 @@ 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; } } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/