From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 21 Jun 2019 09:24:26 +0000 (+0300)
Subject: Do not use Manual VDB mode if C malloc is redirected
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4858bf34a39a3ec3a04ab898850d951c80b89a1c;p=gc

Do not use Manual VDB mode if C malloc is redirected
(fix of commit 06009b0a0)

* misc.c [!GC_DISABLE_INCREMENTAL && (REDIRECT_MALLOC
|| REDIRECT_MALLOC_IN_HEADER)] (GC_init, GC_enable_incremental):
Do not set GC_manual_vdb to true.
---

diff --git a/misc.c b/misc.c
index 15570ca8..f3a086be 100644
--- a/misc.c
+++ b/misc.c
@@ -1234,6 +1234,7 @@ GC_API void GC_CALL GC_init(void)
 #   ifndef GC_DISABLE_INCREMENTAL
       if (GC_incremental || 0 != GETENV("GC_ENABLE_INCREMENTAL")) {
 #       if defined(BASE_ATOMIC_OPS_EMULATED) || defined(CHECKSUMS) \
+           || defined(REDIRECT_MALLOC) || defined(REDIRECT_MALLOC_IN_HEADER) \
            || defined(SMALL_CONFIG)
           /* TODO: Implement CHECKSUMS for manual VDB. */
 #       else
@@ -1380,7 +1381,8 @@ GC_API void GC_CALL GC_enable_incremental(void)
           LOCK();
         } else {
 #         if !defined(BASE_ATOMIC_OPS_EMULATED) && !defined(CHECKSUMS) \
-             && !defined(SMALL_CONFIG)
+             && !defined(REDIRECT_MALLOC) \
+             && !defined(REDIRECT_MALLOC_IN_HEADER) && !defined(SMALL_CONFIG)
             if (manual_vdb_allowed) {
               GC_manual_vdb = TRUE;
               GC_incremental = TRUE;