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

src/asmjs/asm-js.cc

Index: src/asmjs/asm-js.cc
diff --git a/src/asmjs/asm-js.cc b/src/asmjs/asm-js.cc
index 934a1d5bd0e4edcbe617d280fffb98f460132f09..2a1f1c26a0e4e98f0376b6f43ed0f49ccf9714e8 100644
--- a/src/asmjs/asm-js.cc
+++ b/src/asmjs/asm-js.cc
@@ -263,19 +263,21 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
 
   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>();
   }
@@ -283,9 +285,8 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
   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();
@@ -316,7 +317,7 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
       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;
@@ -347,7 +348,7 @@ MaybeHandle<Object> AsmJs::InstantiateAsmWasm(i::Isolate* isolate,
     MessageHandler::ReportMessage(isolate, &location, message);
   }
 
-  return module_object;
+  return exports;
 }
 
 }  // namespace internal