build: update WAVM to latest. (envoyproxy#64)

Signed-off-by: Piotr Sikora <[email protected]>
PiotrSikora · May 10, 2019 · 3735783 · 3735783
1 parent b7455cc
commit 3735783
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/ci/build_container/build_recipes/wavm.sh b/ci/build_container/build_recipes/wavm.sh
@@ -31,8 +31,8 @@ cp -pR include/ "$THIRDPARTY_BUILD"/lib/llvm-6.0/include/
 
 # WAVM.
 
-COMMIT=275e15fff5928d5cac3b8c5410c5a3b3fa7168ac  # Wed Feb 20 16:13:27 2019 -0500
-SHA256=1e8306322c7de31ecb6cceb198ff1a3f37e31702402235f242a4daf68b54242f
+COMMIT=0c764ba09fd9aaa31645761001c64fdb4d13b4ae  # Tue Apr 30 06:35:31 2019 -0400
+SHA256=abf650ec5a53d18150ed7025277dcd1b076a89bed29eff73345cb308df3926b5
 
 curl https://github.com/WAVM/WAVM/archive/"$COMMIT".tar.gz -sLo WAVM-"$COMMIT".tar.gz \
   && echo "$SHA256" WAVM-"$COMMIT".tar.gz | sha256sum --check

diff --git a/ci/prebuilt/BUILD b/ci/prebuilt/BUILD
@@ -30,19 +30,7 @@ cc_library(
     srcs = select({
         "@envoy//bazel:windows_x86_64": ["WINDOWS_IS_NOT_SUPPORTED_YET"],
         "//conditions:default": [
-            # ld: Runtime and WASTParse need to be listed first.
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libRuntime.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libWASTParse.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libEmscripten.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libIR.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libLLVMJIT.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libLogging.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libNFA.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libPlatform.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libRegExp.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libThreadTest.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libWASM.a",
-            "thirdparty_build/lib/WAVM/RelWithDebInfo/libWASTPrint.a",
+            "thirdparty_build/lib/libWAVM.a",
             "thirdparty_build/lib/WAVM/libWAVMUnwind.a",
         ] + [
             # ld: listed in order from llvm-config --libnames.

diff --git a/source/extensions/common/wasm/wavm/wavm.cc b/source/extensions/common/wasm/wavm/wavm.cc
@@ -307,7 +307,7 @@ Wavm::~Wavm() {
   if (emscriptenInstance_) {
     emscriptenInstance_->env = nullptr;
     emscriptenInstance_->global = nullptr;
-    emscriptenInstance_->emscriptenMemory = nullptr;
+    emscriptenInstance_->memory = nullptr;
     delete emscriptenInstance_;
   }
   context_ = nullptr;
@@ -410,7 +410,7 @@ void Wavm::start(Context* context) {
     }
 
     if (emscriptenInstance_) {
-      Emscripten::initializeGlobals(context_, irModule_, moduleInstance_);
+      Emscripten::initializeGlobals(emscriptenInstance_, context_, irModule_, moduleInstance_);
     }
 
     f = asFunctionNullable(getInstanceExport(moduleInstance_, "__post_instantiate"));