Commit a4944d8d authored by Ben Gamari's avatar Ben Gamari 🐢 Committed by Marge Bot

Fix it

parent 5aab1d9c
Pipeline #3179 passed with stages
in 282 minutes and 49 seconds
......@@ -940,7 +940,9 @@ update_bkwd_compact( generation *gen )
}
void
compact(StgClosure *static_objects, StgWeak *dead_weak_ptr_list, StgTSO *resurrected_threads)
compact(StgClosure *static_objects,
StgWeak **dead_weak_ptr_list,
StgTSO **resurrected_threads)
{
W_ n, g, blocks;
generation *gen;
......@@ -958,7 +960,7 @@ compact(StgClosure *static_objects, StgWeak *dead_weak_ptr_list, StgTSO *resurre
}
if (dead_weak_ptr_list != NULL) {
thread((void *)&dead_weak_ptr_list); // tmp
thread((void *)dead_weak_ptr_list); // tmp
}
// mutable lists
......@@ -981,7 +983,7 @@ compact(StgClosure *static_objects, StgWeak *dead_weak_ptr_list, StgTSO *resurre
}
// any threads resurrected during this GC
thread((void *)&resurrected_threads);
thread((void *)resurrected_threads);
// the task list
{
......
......@@ -46,7 +46,7 @@ is_marked(StgPtr p, bdescr *bd)
}
void compact (StgClosure *static_objects,
StgWeak *dead_weak_ptr_list,
StgTSO *resurrected_threads);
StgWeak **dead_weak_ptr_list,
StgTSO **resurrected_threads);
#include "EndPrivate.h"
......@@ -473,7 +473,9 @@ GarbageCollect (uint32_t collect_gen,
// Finally: compact or sweep the oldest generation.
if (major_gc && oldest_gen->mark) {
if (oldest_gen->compact)
compact(gct->scavenged_static_objects, dead_weak_ptr_list, resurrected_threads);
compact(gct->scavenged_static_objects,
&dead_weak_ptr_list,
&resurrected_threads);
else
sweep(oldest_gen);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment