[wasm][asm.js] Make asm.js->wasm return a regular object.

src/asmjs/asm-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/asmjs/asm-js.h"
 
 #include "src/api-natives.h"
 #include "src/api.h"
 #include "src/asmjs/asm-typer.h"
 #include "src/asmjs/asm-wasm-builder.h"
@@ skipping 245 matching lines @@
                                               Handle<JSReceiver> foreign) {
   base::ElapsedTimer instantiate_timer;
   instantiate_timer.Start();
   i::Handle<i::WasmModuleObject> module(
       i::WasmModuleObject::cast(wasm_data->get(kWasmDataCompiledModule)));
   i::Handle<i::FixedArray> foreign_globals(
       i::FixedArray::cast(wasm_data->get(kWasmDataForeignGlobals)));
 
   ErrorThrower thrower(isolate, "Asm.js -> WebAssembly instantiation");
 
+  Handle<JSFunction> object_function =
+      Handle<JSFunction>(isolate->native_context()->object_function(), isolate);
+
   // Create the ffi object for foreign functions {"": foreign}.
   Handle<JSObject> ffi_object;
   if (!foreign.is_null()) {
-    Handle<JSFunction> object_function = Handle<JSFunction>(
-        isolate->native_context()->object_function(), isolate);
     ffi_object = isolate->factory()->NewJSObject(object_function);
     JSObject::AddProperty(ffi_object, isolate->factory()->empty_string(),
                           foreign, NONE);
   }
 
-  i::MaybeHandle<i::JSObject> maybe_module_object =
+  Handle<JSObject> exports = isolate->factory()->NewJSObject(object_function);
+  i::MaybeHandle<i::WasmInstanceObject> maybe_module_object =
       i::wasm::WasmModule::Instantiate(isolate, &thrower, module, ffi_object,
-                                       memory);
+                                       memory, exports);
   if (maybe_module_object.is_null()) {
     return MaybeHandle<Object>();
   }
 
   i::Handle<i::Name> init_name(isolate->factory()->InternalizeUtf8String(
       wasm::AsmWasmBuilder::foreign_init_name));
 
-  i::Handle<i::Object> module_object = maybe_module_object.ToHandleChecked();
   i::MaybeHandle<i::Object> maybe_init =
-      i::Object::GetProperty(module_object, init_name);
+      i::Object::GetProperty(exports, init_name);
   DCHECK(!maybe_init.is_null());
 
   i::Handle<i::Object> init = maybe_init.ToHandleChecked();
   i::Handle<i::Object> undefined(isolate->heap()->undefined_value(), isolate);
   i::Handle<i::Object>* foreign_args_array =
       new i::Handle<i::Object>[foreign_globals->length()];
   for (int j = 0; j < foreign_globals->length(); j++) {
     if (!foreign.is_null()) {
       i::MaybeHandle<i::Name> name = i::Object::ToName(
           isolate, i::Handle<i::Object>(foreign_globals->get(j), isolate));
@@ skipping 10 matching lines @@
   }
   i::MaybeHandle<i::Object> retval = i::Execution::Call(
       isolate, init, undefined, foreign_globals->length(), foreign_args_array);
   delete[] foreign_args_array;
   DCHECK(!retval.is_null());
 
   i::Handle<i::Name> single_function_name(
       isolate->factory()->InternalizeUtf8String(
           wasm::AsmWasmBuilder::single_function_name));
   i::MaybeHandle<i::Object> single_function =
-      i::Object::GetProperty(module_object, single_function_name);
+      i::Object::GetProperty(exports, single_function_name);
   if (!single_function.is_null() &&
       !single_function.ToHandleChecked()->IsUndefined(isolate)) {
     return single_function;
   }
 
   i::Handle<i::Script> script(i::Script::cast(wasm_data->get(kWasmDataScript)));
   int32_t position = 0;
   if (!wasm_data->get(kWasmDataScriptPosition)->ToInt32(&position)) {
     UNREACHABLE();
   }
@@ skipping 10 matching lines @@
   USE(length);
   Handle<String> stext(isolate->factory()->InternalizeUtf8String(text));
   Handle<JSMessageObject> message = MessageHandler::MakeMessageObject(
       isolate, MessageTemplate::kAsmJsInstantiated, &location, stext,
       Handle<JSArray>::null());
   message->set_error_level(v8::Isolate::kMessageInfo);
   if (!FLAG_suppress_asm_messages && FLAG_trace_asm_time) {
     MessageHandler::ReportMessage(isolate, &location, message);
   }
 
-  return module_object;
+  return exports;
 }
 
 }  // namespace internal
 }  // namespace v8