[wasm] asm.js - Remove Wasm.instantiateModuleFromAsm, use asm.js directly.

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 108 matching lines @@
                                                 buffer.start, buffer.end);
   }
 
   if (result.failed()) {
     thrower.Failed("", result);
   }
 
   if (result.val) delete result.val;
 }
 
-i::MaybeHandle<i::FixedArray> TranslateAsmModule(i::ParseInfo* info,
-                                                 ErrorThrower* thrower) {
-  info->set_global();
-  info->set_lazy(false);
-  info->set_allow_lazy_parsing(false);
-  info->set_toplevel(true);
-
-  if (!i::Compiler::ParseAndAnalyze(info)) {
-    return i::MaybeHandle<i::FixedArray>();
-  }
-
-  if (info->scope()->declarations()->length() == 0) {
-    thrower->Error("Asm.js validation failed: no declarations in scope");
-    return i::MaybeHandle<i::FixedArray>();
-  }
-
-  if (!info->scope()->declarations()->at(0)->IsFunctionDeclaration()) {
-    thrower->Error("Asm.js validation failed: non-function declaration");
-    return i::MaybeHandle<i::FixedArray>();
-  }
-
-  info->set_literal(
-      info->scope()->declarations()->at(0)->AsFunctionDeclaration()->fun());
-
-  return i::AsmJs::ConvertAsmToWasm(info);
-}
-
 i::MaybeHandle<i::JSObject> InstantiateModule(
     const v8::FunctionCallbackInfo<v8::Value>& args, const byte* start,
     const byte* end, ErrorThrower* thrower,
     internal::wasm::ModuleOrigin origin = i::wasm::kWasmOrigin) {
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(args.GetIsolate());
 
   // Decode but avoid a redundant pass over function bodies for verification.
   // Verification will happen during compilation.
   i::Zone zone(isolate->allocator());
   internal::wasm::ModuleResult result = internal::wasm::DecodeWasmModule(
@@ skipping 26 matching lines @@
       if (!object.is_null()) {
         args.GetReturnValue().Set(v8::Utils::ToLocal(object.ToHandleChecked()));
       }
     }
   }
 
   if (result.val) delete result.val;
   return object;
 }
 
-void InstantiateModuleFromAsm(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  HandleScope scope(args.GetIsolate());
-  i::Isolate* isolate = reinterpret_cast<i::Isolate*>(args.GetIsolate());
-  ErrorThrower thrower(isolate, "Wasm.instantiateModuleFromAsm()");
-
-  if (!args[0]->IsString()) {
-    thrower.Error("Asm module text should be a string");
-    return;
-  }
-
-  i::Factory* factory = isolate->factory();
-  i::Zone zone(isolate->allocator());
-  Local<String> source = Local<String>::Cast(args[0]);
-  i::Handle<i::Script> script = factory->NewScript(Utils::OpenHandle(*source));
-  i::ParseInfo info(&zone, script);
-
-  auto wasm_data = TranslateAsmModule(&info, &thrower);
-  if (wasm_data.is_null()) {
-    thrower.Error("asm.js failed to validate");
-    return;
-  }
-
-  i::Handle<i::JSReceiver> stdlib;
-  if (args.Length() > 1 && args[1]->IsObject()) {
-    Local<Object> obj = Local<Object>::Cast(args[1]);
-    i::Handle<i::Object> hobj =
-        i::Handle<i::Object>::cast(v8::Utils::OpenHandle(*obj));
-    if (hobj->IsJSReceiver()) {
-      stdlib = i::Handle<i::JSReceiver>::cast(v8::Utils::OpenHandle(*obj));
-    }
-  }
-
-  i::Handle<i::JSReceiver> foreign;
-  if (args.Length() > 2 && args[2]->IsObject()) {
-    Local<Object> obj = Local<Object>::Cast(args[2]);
-    i::Handle<i::Object> hobj =
-        i::Handle<i::Object>::cast(v8::Utils::OpenHandle(*obj));
-    if (hobj->IsJSReceiver()) {
-      foreign = i::Handle<i::JSReceiver>::cast(v8::Utils::OpenHandle(*obj));
-    }
-  }
-
-  i::Handle<i::JSArrayBuffer> memory = i::Handle<i::JSArrayBuffer>::null();
-  if (args.Length() > 3 && args[3]->IsArrayBuffer()) {
-    Local<Object> obj = Local<Object>::Cast(args[3]);
-    i::Handle<i::Object> mem_obj = v8::Utils::OpenHandle(*obj);
-    memory = i::Handle<i::JSArrayBuffer>(i::JSArrayBuffer::cast(*mem_obj));
-  }
-
-  if (!i::AsmJs::IsStdlibValid(isolate, wasm_data.ToHandleChecked(), stdlib)) {
-    thrower.Error("Asm module uses missing stdlib function");
-    return;
-  }
-
-  i::MaybeHandle<i::Object> maybe_module_object = i::AsmJs::InstantiateAsmWasm(
-      isolate, wasm_data.ToHandleChecked(), memory, foreign);
-  if (maybe_module_object.is_null()) {
-    return;
-  }
-
-  args.GetReturnValue().Set(
-      v8::Utils::ToLocal(maybe_module_object.ToHandleChecked()));
-}
-
 void InstantiateModule(const v8::FunctionCallbackInfo<v8::Value>& args) {
   HandleScope scope(args.GetIsolate());
   i::Isolate* isolate = reinterpret_cast<i::Isolate*>(args.GetIsolate());
   ErrorThrower thrower(isolate, "Wasm.instantiateModule()");
 
   if (args.Length() < 1) {
     thrower.Error("Argument 0 must be a buffer source");
     return;
   }
   RawBuffer buffer = GetRawBufferSource(args[0], &thrower);
@@ skipping 180 matching lines @@
         cons, Handle<Object>(context->initial_object_prototype(), isolate));
     cons->shared()->set_instance_class_name(*name);
     Handle<JSObject> wasm_object = factory->NewJSObject(cons, TENURED);
     PropertyAttributes attributes = static_cast<PropertyAttributes>(DONT_ENUM);
     JSObject::AddProperty(global, name, wasm_object, attributes);
 
     // Install functions on the WASM object.
     InstallFunc(isolate, wasm_object, "verifyModule", VerifyModule);
     InstallFunc(isolate, wasm_object, "verifyFunction", VerifyFunction);
     InstallFunc(isolate, wasm_object, "instantiateModule", InstantiateModule);
-    InstallFunc(isolate, wasm_object, "instantiateModuleFromAsm",
-                InstantiateModuleFromAsm);
 
     {
       // Add the Wasm.experimentalVersion property.
       Handle<String> name = v8_str(isolate, "experimentalVersion");
       PropertyAttributes attributes =
           static_cast<PropertyAttributes>(DONT_DELETE | READ_ONLY);
       Handle<Smi> value =
           Handle<Smi>(Smi::FromInt(wasm::kWasmVersion), isolate);
       JSObject::AddProperty(wasm_object, name, value, attributes);
     }
@@ skipping 53 matching lines @@
     int unused_property_fields = in_object_properties - pre_allocated;
     Handle<Map> map = Map::CopyInitialMap(
         prev_map, instance_size, in_object_properties, unused_property_fields);
 
     context->set_wasm_function_map(*map);
   }
 }
 
 }  // namespace internal
 }  // namespace v8