From 0dfe3cc3b4fd7428aeb94966df6496659ae52f16 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Thu, 5 Jul 2018 17:38:11 +0300 Subject: [PATCH] Fix test_cpp failure in case GC_DEBUG is defined Now GC_bytes_freed is updated even if the real deallocation of the explicitly freed object is deferred. * dbg_mlc.c (GC_debug_free): Increment GC_bytes_freed by hhdr->hb_sz in case of GC_free is not called (when the object is filled with GC_FREED_MEM_MARKER); add comment. --- dbg_mlc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dbg_mlc.c b/dbg_mlc.c index 50eda33f..af9652af 100644 --- a/dbg_mlc.c +++ b/dbg_mlc.c @@ -799,11 +799,17 @@ GC_API void GC_CALL GC_debug_free(void * p) GC_free(base); } else { word i; - word obj_sz = BYTES_TO_WORDS(hhdr->hb_sz - sizeof(oh)); + word sz = hhdr -> hb_sz; + word obj_sz = BYTES_TO_WORDS(sz - sizeof(oh)); for (i = 0; i < obj_sz; ++i) ((word *)p)[i] = GC_FREED_MEM_MARKER; - GC_ASSERT((word *)p + i == (word *)(base + hhdr -> hb_sz)); + GC_ASSERT((word *)p + i == (word *)(base + sz)); + /* Update the counter even though the real deallocation */ + /* is deferred. */ + LOCK(); + GC_bytes_freed += sz; + UNLOCK(); } } /* !GC_find_leak */ } -- 2.40.0