From ec983ff2c10f5c228f26734798f5a44135abf3b6 Mon Sep 17 00:00:00 2001 From: Jake Hughes Date: Tue, 2 Apr 2024 15:09:38 +0100 Subject: [PATCH 1/2] Allow finalized_malloc to delay reclaiming disclaimed objects This flag allows the objects reachable only from a finalizable object to stay marked until the next GC. This allows the disclaim function to enqueue those objects to be finalised at some later point in time. --- fnlz_mlc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fnlz_mlc.c b/fnlz_mlc.c index 6e49b220d..a56bbb847 100644 --- a/fnlz_mlc.c +++ b/fnlz_mlc.c @@ -49,7 +49,14 @@ STATIC int GC_CALLBACK GC_finalized_disclaim(void *obj) GC_ASSERT(!GC_find_leak); (*fc->proc)((word *)obj + 1, fc->cd); } +#ifdef DISCLAIM_MARK_CHILDREN + /* Prevent the objects reachable from the disclaimed object from */ + /* being reclaimed immediately by marking them as live. Useful if */ + /* the disclaim function queues objects to be finalised later. */ + return 1; +#else return 0; +#endif } STATIC void GC_register_disclaim_proc_inner(unsigned kind, From 4f2af10ddda407dca5a189a7ea6a5f90ef0ebff3 Mon Sep 17 00:00:00 2001 From: Jake Hughes Date: Tue, 2 Apr 2024 15:32:44 +0100 Subject: [PATCH 2/2] Use latest debian in dockerfile --- .buildbot_dockerfile_debian | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildbot_dockerfile_debian b/.buildbot_dockerfile_debian index f30c16731..3b93e3f80 100644 --- a/.buildbot_dockerfile_debian +++ b/.buildbot_dockerfile_debian @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:latest ARG CI_UID RUN useradd -m -u ${CI_UID} ci RUN apt-get update && \