common-lisp/sbcl.sbcl
1
0
Fork 0
mirror of git://git.code.sf.net/p/sbcl/sbcl synced 2026-09-10 07:26:40 -04:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix bug from rev c8f1b4bb86

Browse source 
It was enqueueing already-marked conses.
This commit is contained in:
Douglas Katzman 2022-02-17 16:01:52 -05:00
parent ec6bd19b89
commit 91a9282862
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/runtime/fullcgc.c
View file

@ -240,10 +240,9 @@ void __mark_obj(lispobj pointer)
if (!bits) {
bits = allocate_cons_mark_bits();
hopscotch_insert(&mark_bits, key, (sword_t)bits);
} else if (bits[index / 8] & (1 << (index % 8))) {
return;
}
#endif
if (bits[index / 8] & (1 << (index % 8))) return;
// Mark the cons
bits[index / 8] |= 1 << (index % 8);
}
@ -400,15 +399,12 @@ static void trace_object(lispobj* where)
void prepare_for_full_mark_phase()
{
// FIXME: Estimate how large to create mark_bits based on dynamic space size.
// Guess 8 words per object, and X% of the objects are conses.
// The problem is guessing how localized the conses are: guess that N conses
// will reside on fraction*N different pages, which guides us as to how many
// hash table entries are needed.
#ifndef LISP_FEATURE_USE_CONS_REGION
hopscotch_create(&mark_bits, HOPSCOTCH_HASH_FUN_DEFAULT,
N_WORD_BYTES, /* table values are machine words */
65536, /* initial size */
0);
#endif
free_page = page_table_pages;
suballocator_free_ptr = suballocator_end_ptr = 0;
@ -659,7 +655,6 @@ void execute_full_sweep_phase()
fprintf(stderr, "%ld%s", words_zeroed[i], i?"+":"");
fprintf(stderr, " words zeroed]\n");
}
hopscotch_destroy(&mark_bits);
#ifdef LISP_FEATURE_USE_CONS_REGION
page_index_t page;
for (page = 0; page < next_free_page; ++page)
@ -669,6 +664,8 @@ void execute_full_sweep_phase()
char* end = base + GENCGC_PAGE_BYTES;
memset(bits, 0, end-bits);
}
#else
hopscotch_destroy(&mark_bits);
#endif
if (sweeplog)

5
tests/gc-smoketest.pure.lisp
View file

@ -7,3 +7,8 @@
(with-test (:name :layoutless-instance-no-crash)
(f 20)
(gc))
;;; Don't loop infinitely in mark_obj() on circular lists
(defvar *foo* (cons nil nil))
(rplacd *foo* *foo*)
(with-test (:name :circular-list) (gc :gen 7))