Skip to content

Commit

Permalink
Temporarily disable the use of __heap_base. (WebAssembly#132)
Browse files Browse the repository at this point in the history
This temporarily disables the feature in
a214f1c, since it hits LLVM bug
43613, which is fixed on LLVM master and awaiting a backport to
the 9.0 branch.

https://bugs.llvm.org/show_bug.cgi?id=43613
  • Loading branch information
sunfishcode authored Nov 7, 2019
1 parent a214f1c commit ec4549d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 6 additions & 0 deletions dlmalloc/src/malloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4560,10 +4560,12 @@ 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) {
/*
Expand Down Expand Up @@ -4593,11 +4595,13 @@ 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)) {
Expand Down Expand Up @@ -5209,6 +5213,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
#else
/* ------------------ Exported try_init_allocator -------------------- */
Expand Down Expand Up @@ -5244,6 +5249,7 @@ static void try_init_allocator(void) {
init_top(gm, (mchunkptr)base, initial_heap_size - TOP_FOOT_SIZE);
}
#endif
#endif

/* ------------------ Exported realloc, memalign, etc -------------------- */

Expand Down
1 change: 0 additions & 1 deletion expected/wasm32-wasi/undefined-symbols.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ __floatsitf
__floatunsitf
__getf2
__gttf2
__heap_base
__letf2
__lttf2
__netf2
Expand Down

0 comments on commit ec4549d

Please sign in to comment.