commit 94f9c4afec6f14bc27aa02d6fc345c6afea455f3
author Jakob Kummerow <jkummerow@chromium.org> Tue May 14 12:15:07 2019
committer Commit Bot <commit-bot@chromium.org> Wed May 15 09:24:35 2019
tree cdff3ee23340d239656634b743fc2ab4161cb833
parent 946929f40612f4fbe9158582879a5ad9f855c058

[wasm-c-api] Faster types handling when calling into Wasm

We don't need the full "types" array, just the number of parameters
and the type of the result. Avoiding unnecessary malloc/free calls
significantly cuts down on overhead.

Change-Id: I738f0ee4c269731cf1ff79a56f910e8f7e97c83e
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1601505
Commit-Queue: Yang Guo <yangguo@chromium.org>
Auto-Submit: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Yang Guo <yangguo@chromium.org>
Reviewed-by: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#61511}

src/inspector/v8-string-conversions.cc

diff --git a/src/inspector/v8-string-conversions.cc b/src/inspector/v8-string-conversions.cc
index 19d2fa8..f6e8d53 100644
--- a/src/inspector/v8-string-conversions.cc
+++ b/src/inspector/v8-string-conversions.cc
@@ -6,6 +6,7 @@
 
 #include <limits>
 #include <vector>
+
 #include "src/base/logging.h"
 #include "src/base/v8-fallthrough.h"
 

src/wasm/c-api.cc

diff --git a/src/wasm/c-api.cc b/src/wasm/c-api.cc
index 24292e6..7aa4a82 100644
--- a/src/wasm/c-api.cc
+++ b/src/wasm/c-api.cc
@@ -1155,9 +1155,9 @@
   }
 }
 
-auto v8_to_val(i::Isolate* isolate, i::Handle<i::Object> value,
-               const ValType* t) -> own<Val> {
-  switch (t->kind()) {
+own<Val> v8_to_val(i::Isolate* isolate, i::Handle<i::Object> value,
+                   ValKind kind) {
+  switch (kind) {
     case I32:
       do {
         if (value->IsSmi()) return Val(i::Smi::ToInt(*value));
@@ -1760,15 +1760,32 @@
   auto i_isolate = store->i_isolate();
   v8::HandleScope handle_scope(isolate);
 
-  auto type = this->type();
-  auto& param_types = type->params();
-  auto& result_types = type->results();
-
+  int num_params;
+  int num_results;
+  ValKind result_kind;
+  i::Handle<i::JSFunction> v8_func = func->v8_object();
+  if (i::WasmExportedFunction::IsWasmExportedFunction(*v8_func)) {
+    i::WasmExportedFunction wef = i::WasmExportedFunction::cast(*v8_func);
+    i::wasm::FunctionSig* sig =
+        wef->instance()->module()->functions[wef->function_index()].sig;
+    num_params = static_cast<int>(sig->parameter_count());
+    num_results = static_cast<int>(sig->return_count());
+    if (num_results > 0) {
+      result_kind = v8::wasm::v8_valtype_to_wasm(sig->GetReturn(0));
+    }
+#if DEBUG
+    for (int i = 0; i < num_params; i++) {
+      DCHECK_EQ(args[i].kind(), v8::wasm::v8_valtype_to_wasm(sig->GetParam(i)));
+    }
+#endif
+  } else {
+    DCHECK(i::WasmCapiFunction::IsWasmCapiFunction(*v8_func));
+    UNIMPLEMENTED();
+  }
   // TODO(rossberg): cache v8_args array per thread.
   auto v8_args = std::unique_ptr<i::Handle<i::Object>[]>(
-      new (std::nothrow) i::Handle<i::Object>[param_types.size()]);
-  for (size_t i = 0; i < param_types.size(); ++i) {
-    assert(args[i].kind() == param_types[i]->kind());
+      new (std::nothrow) i::Handle<i::Object>[num_params]);
+  for (int i = 0; i < num_params; ++i) {
     v8_args[i] = v8::Utils::OpenHandle(*val_to_v8(store, args[i]));
   }
 
@@ -1776,7 +1793,7 @@
   v8::TryCatch handler(isolate);
   i::MaybeHandle<i::Object> maybe_val = i::Execution::Call(
       i_isolate, func->v8_object(), i_isolate->factory()->undefined_value(),
-      static_cast<int>(param_types.size()), v8_args.get());
+      num_params, v8_args.get());
 
   if (handler.HasCaught()) {
     i_isolate->OptionalRescheduleException(true);
@@ -1796,11 +1813,11 @@
   }
 
   auto val = maybe_val.ToHandleChecked();
-  if (result_types.size() == 0) {
+  if (num_results == 0) {
     assert(val->IsUndefined(i_isolate));
-  } else if (result_types.size() == 1) {
+  } else if (num_results == 1) {
     assert(!val->IsUndefined(i_isolate));
-    new (&results[0]) Val(v8_to_val(i_isolate, val, result_types[0]));
+    new (&results[0]) Val(v8_to_val(i_isolate, val, result_kind));
   } else {
     WASM_UNIMPLEMENTED("multiple results");
   }