[wasm] JS-API: enable WebAssembly.instantiate tests; fix LinkError

src/wasm/wasm-js.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/api-natives.h"
 #include "src/api.h"
 #include "src/asmjs/asm-js.h"
 #include "src/asmjs/asm-typer.h"
 #include "src/asmjs/asm-wasm-builder.h"
 #include "src/assert-scope.h"
@@ skipping 174 matching lines @@
   }
   i::MaybeHandle<i::JSObject> module_obj =
       CreateModuleObject(isolate, args[0], &thrower);
   if (module_obj.is_null()) return;
 
   v8::ReturnValue<v8::Value> return_value = args.GetReturnValue();
   return_value.Set(Utils::ToLocal(module_obj.ToHandleChecked()));
 }
 
 MaybeLocal<Value> InstantiateModuleImpl(
-    i::Isolate* i_isolate, i::Handle<i::JSObject> i_module_obj,
+    i::Isolate* i_isolate, i::Handle<i::WasmModuleObject> i_module_obj,
     const v8::FunctionCallbackInfo<v8::Value>& args, ErrorThrower* thrower) {
   // It so happens that in both the WebAssembly.instantiate, as well as
   // WebAssembly.Instance ctor, the positions of the ffi object and memory
   // are the same. If that changes later, we refactor the consts into
   // parameters.
   static const int kFfiOffset = 1;
   static const int kMemOffset = 2;
 
   MaybeLocal<Value> nothing;
   i::Handle<i::JSReceiver> ffi = i::Handle<i::JSObject>::null();
   if (args.Length() > kFfiOffset && !args[kFfiOffset]->IsUndefined()) {
     if (!args[kFfiOffset]->IsObject()) {
       thrower->TypeError("Argument %d must be an object", kFfiOffset);
       return nothing;
     }
     Local<Object> obj = Local<Object>::Cast(args[kFfiOffset]);
     ffi = i::Handle<i::JSReceiver>::cast(v8::Utils::OpenHandle(*obj));
   }
+  if (i_module_obj->compiled_module()->module()->num_imported_functions > 0 &&
+      ffi.is_null()) {
+    thrower->TypeError("Argument %d must be present and must be an object",
+                       kFfiOffset);
+    return nothing;
+  }
 
   i::Handle<i::JSArrayBuffer> memory = i::Handle<i::JSArrayBuffer>::null();
   if (args.Length() > kMemOffset && !args[kMemOffset]->IsUndefined()) {
     if (!args[kMemOffset]->IsObject()) {
       thrower->TypeError("Argument %d must be a WebAssembly.Memory",
                          kMemOffset);
       return nothing;
     }
     Local<Object> obj = Local<Object>::Cast(args[kMemOffset]);
     i::Handle<i::Object> mem_obj = v8::Utils::OpenHandle(*obj);
@@ skipping 90 matching lines @@
 
   Local<Context> context = isolate->GetCurrentContext();
   i::Handle<i::Context> i_context = Utils::OpenHandle(*context);
   if (!BrandCheck(isolate, Utils::OpenHandle(*args[0]),
                   i::Handle<i::Symbol>(i_context->wasm_module_sym()),
                   "Argument 0 must be a WebAssembly.Module")) {
     return;
   }
 
   Local<Object> module_obj = Local<Object>::Cast(args[0]);
-  i::Handle<i::JSObject> i_module_obj =
-      i::Handle<i::JSObject>::cast(v8::Utils::OpenHandle(*module_obj));
+  i::Handle<i::WasmModuleObject> i_module_obj =
+      i::Handle<i::WasmModuleObject>::cast(v8::Utils::OpenHandle(*module_obj));
 
   MaybeLocal<Value> instance =
       InstantiateModuleImpl(i_isolate, i_module_obj, args, &thrower);
   if (instance.IsEmpty()) return;
 
   v8::ReturnValue<v8::Value> return_value = args.GetReturnValue();
   return_value.Set(instance.ToLocalChecked());
 }
 
 void WebAssemblyInstantiate(const v8::FunctionCallbackInfo<v8::Value>& args) {
   v8::Isolate* isolate = args.GetIsolate();
   i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
 
   HandleScope scope(isolate);
   ErrorThrower thrower(i_isolate, "WebAssembly.compile()");
 
   if (args.Length() < 1) {
     thrower.TypeError("Argument 0 must be a buffer source");
     return;
   }
-  i::MaybeHandle<i::JSObject> module_obj =
+  i::MaybeHandle<i::WasmModuleObject> module_obj =
       CreateModuleObject(isolate, args[0], &thrower);
 
   Local<Context> context = isolate->GetCurrentContext();
   v8::Local<v8::Promise::Resolver> resolver;
   if (!v8::Promise::Resolver::New(context).ToLocal(&resolver)) return;
   if (module_obj.is_null()) {
     DCHECK(thrower.error());
     resolver->Reject(context, Utils::ToLocal(thrower.Reify()));
   } else {
     MaybeLocal<Value> instance = InstantiateModuleImpl(
@@ skipping 534 matching lines @@
   i::Handle<i::Symbol> symbol(isolate->context()->wasm_memory_sym(), isolate);
   return HasBrand(value, symbol);
 }
 
 bool WasmJs::IsWasmTableObject(Isolate* isolate, Handle<Object> value) {
   i::Handle<i::Symbol> symbol(isolate->context()->wasm_table_sym(), isolate);
   return HasBrand(value, symbol);
 }
 }  // namespace internal
 }  // namespace v8