[wasm] Fix test-run-wasm-module tests in debug mode.

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 298 matching lines @@
   Handle<String> name = v8_str(isolate, str);
   Handle<FunctionTemplateInfo> temp = NewTemplate(isolate, func);
   Handle<JSFunction> function =
       ApiNatives::InstantiateFunction(temp).ToHandleChecked();
   PropertyAttributes attributes =
       static_cast<PropertyAttributes>(DONT_DELETE | READ_ONLY);
   JSObject::AddProperty(object, name, function, attributes);
   return function;
 }
 
-void WasmJs::SetupIsolateForWasm(Isolate* isolate) {
-  InstallWasmFunctionMap(isolate, isolate->native_context());
-  InstallWasmModuleSymbol(isolate, isolate->global_object(),
-                          isolate->native_context());
-}
+void WasmJs::InstallWasmModuleSymbolIfNeeded(Isolate* isolate,
+                                             Handle<JSGlobalObject> global,
+                                             Handle<Context> context) {
+  if (!context->get(Context::WASM_MODULE_SYM_INDEX)->IsSymbol() ||
+      !context->get(Context::WASM_INSTANCE_SYM_INDEX)->IsSymbol()) {
+    Factory* factory = isolate->factory();
+    // Create private symbols.
+    Handle<Symbol> module_sym = factory->NewPrivateSymbol();
+    Handle<Symbol> instance_sym = factory->NewPrivateSymbol();
+    context->set_wasm_module_sym(*module_sym);
+    context->set_wasm_instance_sym(*instance_sym);
 
-void WasmJs::InstallWasmModuleSymbol(Isolate* isolate,
-                                     Handle<JSGlobalObject> global,
-                                     Handle<Context> context) {
-  Factory* factory = isolate->factory();
-  // Create private symbols.
-  Handle<Symbol> module_sym = factory->NewPrivateSymbol();
-  Handle<Symbol> instance_sym = factory->NewPrivateSymbol();
-  context->set_wasm_module_sym(*module_sym);
-  context->set_wasm_instance_sym(*instance_sym);
+    // Bind the WebAssembly object.
+    Handle<String> name = v8_str(isolate, "WebAssembly");
+    Handle<JSFunction> cons = factory->NewFunction(name);
+    JSFunction::SetInstancePrototype(
+        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);
 
-  // Bind the WebAssembly object.
-  Handle<String> name = v8_str(isolate, "WebAssembly");
-  Handle<JSFunction> cons = factory->NewFunction(name);
-  JSFunction::SetInstancePrototype(
-      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 static methods on WebAssembly object.
+    InstallFunc(isolate, wasm_object, "compile", WebAssemblyCompile);
+    Handle<JSFunction> module_constructor =
+        InstallFunc(isolate, wasm_object, "Module", WebAssemblyModule);
+    Handle<JSFunction> instance_constructor =
+        InstallFunc(isolate, wasm_object, "Instance", WebAssemblyInstance);
+    i::Handle<i::Map> map = isolate->factory()->NewMap(
+        i::JS_OBJECT_TYPE, i::JSObject::kHeaderSize + i::kPointerSize);
+    module_constructor->set_prototype_or_initial_map(*map);
+    map->SetConstructor(*module_constructor);
 
-  // Install static methods on WebAssembly object.
-  InstallFunc(isolate, wasm_object, "compile", WebAssemblyCompile);
-  Handle<JSFunction> module_constructor =
-      InstallFunc(isolate, wasm_object, "Module", WebAssemblyModule);
-  Handle<JSFunction> instance_constructor =
-      InstallFunc(isolate, wasm_object, "Instance", WebAssemblyInstance);
-  i::Handle<i::Map> map = isolate->factory()->NewMap(
-      i::JS_OBJECT_TYPE, i::JSObject::kHeaderSize + i::kPointerSize);
-  module_constructor->set_prototype_or_initial_map(*map);
-  map->SetConstructor(*module_constructor);
-
-  context->set_wasm_module_constructor(*module_constructor);
-  context->set_wasm_instance_constructor(*instance_constructor);
+    context->set_wasm_module_constructor(*module_constructor);
+    context->set_wasm_instance_constructor(*instance_constructor);
+  }
 }
 
 void WasmJs::Install(Isolate* isolate, Handle<JSGlobalObject> global) {
   if (!FLAG_expose_wasm && !FLAG_validate_asm) {
     return;
   }
 
   Factory* factory = isolate->factory();
 
   // Setup wasm function map.
   Handle<Context> context(global->native_context(), isolate);
-  InstallWasmFunctionMap(isolate, context);
+  InstallWasmFunctionMapIfNeeded(isolate, context);
 
   if (!FLAG_expose_wasm) {
     return;
   }
 
   // Bind the experimental WASM object.
   // TODO(rossberg, titzer): remove once it's no longer needed.
   {
     Handle<String> name = v8_str(isolate, "Wasm");
     Handle<JSFunction> cons = factory->NewFunction(name);
@@ skipping 12 matching lines @@
     {
       // 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);
     }
   }
-  InstallWasmModuleSymbol(isolate, global, context);
+  InstallWasmModuleSymbolIfNeeded(isolate, global, context);
 }
 
-void WasmJs::InstallWasmFunctionMap(Isolate* isolate, Handle<Context> context) {
+void WasmJs::InstallWasmFunctionMapIfNeeded(Isolate* isolate,
+                                            Handle<Context> context) {
   if (!context->get(Context::WASM_FUNCTION_MAP_INDEX)->IsMap()) {
     // TODO(titzer): Move this to bootstrapper.cc??
     // TODO(titzer): Also make one for strict mode functions?
     Handle<Map> prev_map = Handle<Map>(context->sloppy_function_map(), isolate);
 
     InstanceType instance_type = prev_map->instance_type();
     int internal_fields = JSObject::GetInternalFieldCount(*prev_map);
     CHECK_EQ(0, internal_fields);
     int pre_allocated =
         prev_map->GetInObjectProperties() - prev_map->unused_property_fields();
     int instance_size = 0;
     int in_object_properties = 0;
     int wasm_internal_fields = internal_fields + 1  // module instance object
                                + 1                  // function arity
                                + 1;                 // function signature
     JSFunction::CalculateInstanceSizeHelper(instance_type, wasm_internal_fields,
                                             0, &instance_size,
                                             &in_object_properties);
 
     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