From 04c22d53a4493f014da95d5e015259bdcdc251e6 Mon Sep 17 00:00:00 2001
From: Piotr Sikora <piotrsikora@google.com>
Date: Mon, 26 Oct 2020 10:47:17 +0000
Subject: [PATCH] Use proxy_on_memory_allocate() as a fallback for malloc().

On some targets (e.g. Rust's wasm32-wasi), it's impossible to export
malloc due to a collision with libc's malloc.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>
---
 src/wasm.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/wasm.cc b/src/wasm.cc
index 8ded8473..9472873d 100644
--- a/src/wasm.cc
+++ b/src/wasm.cc
@@ -193,14 +193,19 @@ void WasmBase::registerCallbacks() {
 
 void WasmBase::getFunctions() {
 #define _GET(_fn) wasm_vm_->getFunction(#_fn, &_fn##_);
+#define _GET_ALIAS(_fn, _alias) wasm_vm_->getFunction(#_alias, &_fn##_);
   _GET(_initialize);
   _GET(_start);
   _GET(__wasm_call_ctors);
 
   _GET(malloc);
+  if (!malloc_) {
+    _GET_ALIAS(malloc, proxy_on_memory_allocate);
+  }
   if (!malloc_) {
     fail(FailState::MissingFunction, "Wasm module is missing malloc function.");
   }
+#undef _GET_ALIAS
 #undef _GET
 
 #define _GET_PROXY(_fn) wasm_vm_->getFunction("proxy_" #_fn, &_fn##_);