suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GC: fix initialization of mark tables for places

Browse Source 
Fixes a mistake in 7d90b27524.
This commit is contained in:
Matthew Flatt 2016-02-29 06:08:29 -07:00
parent 3b25e22dd6
commit 59f3f82460
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
racket/src/racket/gc2/newgc.c
View File

@ -691,6 +691,11 @@ static void initialize_signal_handler(GCTYPE *gc);
static int master_wants_to_collect(); static int master_wants_to_collect();
#endif #endif
/* Due to the way Racket initializes the mark table,
MASTERGC needs to share its mark and fixup tables
with the initial tables of the first place place: */
static int has_made_first_place;
static void NewGC_initialize(NewGC *newgc, NewGC *inheritgc, NewGC *parentgc) { static void NewGC_initialize(NewGC *newgc, NewGC *inheritgc, NewGC *parentgc) {
if (inheritgc) if (inheritgc)
@ -698,12 +703,20 @@ static void NewGC_initialize(NewGC *newgc, NewGC *inheritgc, NewGC *parentgc) {
else else
newgc->number_of_tags = NUMBER_OF_TAGS; newgc->number_of_tags = NUMBER_OF_TAGS;
if (has_made_first_place || !inheritgc) {
newgc->mark_table = ofm_malloc_zero(newgc->number_of_tags * sizeof(Mark2_Proc)); newgc->mark_table = ofm_malloc_zero(newgc->number_of_tags * sizeof(Mark2_Proc));
newgc->fixup_table = ofm_malloc_zero(newgc->number_of_tags * sizeof(Fixup2_Proc)); newgc->fixup_table = ofm_malloc_zero(newgc->number_of_tags * sizeof(Fixup2_Proc));
} else {
newgc->mark_table = inheritgc->mark_table;
newgc->fixup_table = inheritgc->fixup_table;
has_made_first_place = 1;
}
if (inheritgc) { if (inheritgc) {
if (newgc->mark_table != inheritgc->mark_table) {
memcpy(newgc->mark_table, inheritgc->mark_table, newgc->number_of_tags * sizeof(Mark2_Proc)); memcpy(newgc->mark_table, inheritgc->mark_table, newgc->number_of_tags * sizeof(Mark2_Proc));
memcpy(newgc->fixup_table, inheritgc->fixup_table, newgc->number_of_tags * sizeof(Fixup2_Proc)); memcpy(newgc->fixup_table, inheritgc->fixup_table, newgc->number_of_tags * sizeof(Fixup2_Proc));
}
newgc->avoid_collection = 0; newgc->avoid_collection = 0;
#ifdef MZ_USE_PLACES #ifdef MZ_USE_PLACES
newgc->parent_gc = parentgc; newgc->parent_gc = parentgc;