From b2dcab58f7d1696795bae0e5bf33ffc229662ee9 Mon Sep 17 00:00:00 2001
From: Daan <daanl@outlook.com>
Date: Wed, 19 Mar 2025 20:20:36 -0700
Subject: [PATCH 1/3] fix assertion failure (issue #1031)

---
 src/segment.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/segment.c b/src/segment.c
index e2730b7f..75f8dacb 100644
--- a/src/segment.c
+++ b/src/segment.c
@@ -523,7 +523,7 @@ static void mi_segment_os_free(mi_segment_t* segment, size_t segment_size, mi_se
 void _mi_segments_collect(bool force, mi_segments_tld_t* tld) {
   mi_pages_try_purge(force,tld);
   #if MI_DEBUG>=2
-  if (!_mi_is_main_thread()) {
+  if (!_mi_is_main_thread() && force) {
     mi_assert_internal(tld->pages_purge.first == NULL);
     mi_assert_internal(tld->pages_purge.last == NULL);
   }

From 7eafaa968598fc6b1261103f0f53b0db2bc56139 Mon Sep 17 00:00:00 2001
From: Daan <daanl@outlook.com>
Date: Wed, 19 Mar 2025 20:22:02 -0700
Subject: [PATCH 2/3] fix visibility warning (issue #1031)

---
 src/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.c b/src/init.c
index 215eed20..8a48ae5e 100644
--- a/src/init.c
+++ b/src/init.c
@@ -95,7 +95,7 @@ const mi_page_t _mi_page_empty = {
 // may lead to allocation itself on some platforms)
 // --------------------------------------------------------
 
-mi_decl_hidden mi_decl_cache_align const mi_heap_t _mi_heap_empty = {
+mi_decl_cache_align const mi_heap_t _mi_heap_empty = {
   NULL,
   MI_ATOMIC_VAR_INIT(NULL),
   0,                // tid

From 660d749d77822e54b77acecf82f1aa8f348625ae Mon Sep 17 00:00:00 2001
From: Daan <daanl@outlook.com>
Date: Wed, 19 Mar 2025 20:29:29 -0700
Subject: [PATCH 3/3] do not default to MI_DEBUG=2 in release mode builds even
 when NDEBUG is not defined by defininig MI_BUILD_RELEASE (issue #1037)

---
 CMakeLists.txt           | 4 +++-
 include/mimalloc/types.h | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d780fa1..2b1292cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -532,7 +532,9 @@ if(MI_TRACK_ASAN)
 endif()
 string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LC)
 list(APPEND mi_defines "MI_CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE_LC}")  #todo: multi-config project needs $<CONFIG> ?
-if(NOT(CMAKE_BUILD_TYPE_LC MATCHES "^(release|relwithdebinfo|minsizerel|none)$"))
+if(CMAKE_BUILD_TYPE_LC MATCHES "^(release|relwithdebinfo|minsizerel|none)$")
+  list(APPEND mi_defines MI_BUILD_RELEASE)
+else()
   set(mi_libname "${mi_libname}-${CMAKE_BUILD_TYPE_LC}") #append build type (e.g. -debug) if not a release version
 endif()
 
diff --git a/include/mimalloc/types.h b/include/mimalloc/types.h
index 9f743149..5bcdb07f 100644
--- a/include/mimalloc/types.h
+++ b/include/mimalloc/types.h
@@ -66,10 +66,10 @@ terms of the MIT license. A copy of the license can be found in the file
 // #define MI_DEBUG 2  // + internal assertion checks
 // #define MI_DEBUG 3  // + extensive internal invariant checking (cmake -DMI_DEBUG_FULL=ON)
 #if !defined(MI_DEBUG)
-#if !defined(NDEBUG) || defined(_DEBUG)
-#define MI_DEBUG 2
-#else
+#if defined(MI_BUILD_RELEASE) || defined(NDEBUG)
 #define MI_DEBUG 0
+#else
+#define MI_DEBUG 2
 #endif
 #endif