Skip to content

Activate the use of __heap_base #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 1 commit into from
Sep 24, 2020
Merged

Activate the use of __heap_base #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions dlmalloc/src/malloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
/*
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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 -------------------- */

Expand Down Expand Up @@ -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 -------------------- */

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