From d2482b786a00c790f3b8d1bf13f0ca12b0364d9c Mon Sep 17 00:00:00 2001
From: vms <michail.vms@gmail.com>
Date: Thu, 24 Sep 2020 04:14:32 +0300
Subject: [PATCH] activate the use of __heap_base (#215)

---
 dlmalloc/src/malloc.c                      | 8 +-------
 expected/wasm32-wasi/undefined-symbols.txt | 1 +
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlmalloc/src/malloc.c b/dlmalloc/src/malloc.c
index 73e0936..03da739 100644
--- a/dlmalloc/src/malloc.c
+++ b/dlmalloc/src/malloc.c
@@ -4560,12 +4560,10 @@ static void* tmalloc_small(mstate m, size_t nb) {
 
 #if !ONLY_MSPACES
 
-#if 0 // Temporarily work around https://bugs.llvm.org/show_bug.cgi?id=43613
 #if __wasilibc_unmodified_upstream // Forward declaration of try_init_allocator.
 #else
 static void try_init_allocator(void);
 #endif
-#endif
 
 void* dlmalloc(size_t bytes) {
   /*
@@ -4595,13 +4593,11 @@ void* dlmalloc(size_t bytes) {
   ensure_initialization(); /* initialize in sys_alloc if not using locks */
 #endif
 
-#if 0 // Temporarily work around https://bugs.llvm.org/show_bug.cgi?id=43613
 #if __wasilibc_unmodified_upstream // Try to initialize the allocator.
 #else
   if (!is_initialized(gm)) {
     try_init_allocator();
   }
-#endif
 #endif
 
   if (!PREACTION(gm)) {
@@ -5213,8 +5209,7 @@ static void internal_inspect_all(mstate m,
 }
 #endif /* MALLOC_INSPECT_ALL */
 
-#if 0 // Temporarily work around https://bugs.llvm.org/show_bug.cgi?id=43613
-#ifdef __wasilibc_unmodified_upstream // Define a function that initializes the initial state of dlmalloc
+#ifdef __wasilibc_unmodified_upstream // Define a function that initializes the initial state of dlmalloc.
 #else
 /* ------------------ Exported try_init_allocator -------------------- */
 
@@ -5249,7 +5244,6 @@ static void try_init_allocator(void) {
   init_top(gm, (mchunkptr)base, initial_heap_size - TOP_FOOT_SIZE);
 }
 #endif
-#endif
 
 /* ------------------ Exported realloc, memalign, etc -------------------- */
 
diff --git a/expected/wasm32-wasi/undefined-symbols.txt b/expected/wasm32-wasi/undefined-symbols.txt
index 8715e54..47e3106 100644
--- a/expected/wasm32-wasi/undefined-symbols.txt
+++ b/expected/wasm32-wasi/undefined-symbols.txt
@@ -10,6 +10,7 @@ __floatsitf
 __floatunsitf
 __getf2
 __gttf2
+__heap_base
 __letf2
 __lttf2
 __netf2
-- 
2.39.5