Fix overflow with optimized WASM code by ensuring that globals are in…

…itialized. (envoyproxy#25)
lambdai · Feb 21, 2019 · d3a53ef · d3a53ef
1 parent 34802ac
commit d3a53ef
Show file tree

Hide file tree

Showing 7 changed files with 31,809 additions and 94,909 deletions.
diff --git a/source/extensions/common/wasm/wasm.cc b/source/extensions/common/wasm/wasm.cc
@@ -806,12 +806,10 @@ bool Context::isSsl() { return decoder_callbacks_->connection()->ssl() != nullpt
 // Calls into the WASM code.
 //
 void Context::onStart() {
+  wasm_->wasmVm()->start(this);
   if (wasm_->onStart_) {
     wasm_->onStart_(this);
-    return;
   }
-  // Fall back to any start or main() function.
-  wasm_->wasmVm()->start(this);
 }
 
 void Context::onConfigure(absl::string_view configuration) {

diff --git a/source/extensions/common/wasm/wavm/wavm.cc b/source/extensions/common/wasm/wavm/wavm.cc
@@ -276,8 +276,16 @@ bool Wavm::initialize(const std::string& code, absl::string_view name, bool allo
 
 void Wavm::start(Context* context) {
   auto f = getStartFunction(moduleInstance_);
-  if (!f)
+  if (f) {
+    CALL_WITH_CONTEXT(invokeFunctionChecked(context_, f, {}), context);
+  }
+  if (emscriptenInstance_) {
+    Emscripten::initializeGlobals(context_, irModule_, moduleInstance_);
+  }
+  f = asFunctionNullable(getInstanceExport(moduleInstance_, "main"));
+  if (!f) {
     f = asFunctionNullable(getInstanceExport(moduleInstance_, "_main"));
+  }
   if (f) {
     CALL_WITH_CONTEXT(invokeFunctionChecked(context_, f, {}), context);
   }

diff --git a/test/extensions/filters/http/wasm/test_data/Makefile b/test/extensions/filters/http/wasm/test_data/Makefile
@@ -2,11 +2,7 @@ API=../../../../../../api/wasm/cpp
 
 EMSCRIPTEN_OPT=-s WASM=1 -s EMIT_EMSCRIPTEN_METADATA=1
 
-# Note that optimizations are disabled, because optimized WASM module
-# throws wavm.integerDivideByZeroOrOverflow, possibly due to an issue
-# with getFunctionWavm() templates and/or their usage.
-#CXXFLAGS=--std=c++14 -O3 -g3
-CXXFLAGS=--std=c++14 -g3
+CXXFLAGS=--std=c++14 -O3 -g3
 
 all: headers.wasm async_call.wasm
 

diff --git a/test/extensions/filters/http/wasm/test_data/async_call.wasm b/test/extensions/filters/http/wasm/test_data/async_call.wasm
diff --git a/test/extensions/filters/http/wasm/test_data/async_call.wat b/test/extensions/filters/http/wasm/test_data/async_call.wat
diff --git a/test/extensions/filters/http/wasm/test_data/headers.wasm b/test/extensions/filters/http/wasm/test_data/headers.wasm
diff --git a/test/extensions/filters/http/wasm/test_data/headers.wat b/test/extensions/filters/http/wasm/test_data/headers.wat