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

test/cctest/wasm/test-run-wasm-module.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 <stdlib.h>
 #include <string.h>
 
 #include "src/wasm/encoder.h"
 #include "src/wasm/module-decoder.h"
-#include "src/wasm/wasm-js.h"
 #include "src/wasm/wasm-macro-gen.h"
 #include "src/wasm/wasm-module.h"
 #include "src/wasm/wasm-opcodes.h"
 
 #include "test/cctest/cctest.h"
 #include "test/cctest/wasm/test-signatures.h"
 #include "test/common/wasm/wasm-module-runner.h"
 
 using namespace v8::base;
 using namespace v8::internal;
 using namespace v8::internal::compiler;
 using namespace v8::internal::wasm;
 
 namespace {
+static bool isolate_setup_for_module = false;
 void TestModule(Zone* zone, WasmModuleBuilder* builder,
                 int32_t expected_result) {
   ZoneBuffer buffer(zone);
   builder->WriteTo(buffer);
 
   Isolate* isolate = CcTest::InitIsolateOnce();
   HandleScope scope(isolate);
-  WasmJs::SetupIsolateForWasm(isolate);
+  if (!isolate_setup_for_module) {

[Mircea Trofin, 2016/09/16 07:13:01]

This will only setup the first isolate.

[gdeepti, 2016/09/16 07:37:21]

My understanding is that the isolate being returned by CcTest::InitIsolateOnce()
is the only one being used for all the tests except the serializer test, which
sets up its own isolate when a new isolate is used.

+    testing::SetupIsolateForWasmModule(isolate);
+    isolate_setup_for_module = true;
+  }
   int32_t result = testing::CompileAndRunWasmModule(
       isolate, buffer.begin(), buffer.end(), ModuleOrigin::kWasmOrigin);
   CHECK_EQ(expected_result, result);
 }
 
 void ExportAs(WasmFunctionBuilder* f, const char* name) {
   f->SetExported();
   f->SetName(name, static_cast<int>(strlen(name)));
 }
 
@@ skipping 155 matching lines @@
   ExportAs(f, kFunctionName);
 
   ZoneBuffer buffer(&zone);
   builder->WriteTo(buffer);
 
   Isolate* isolate = CcTest::InitIsolateOnce();
   ErrorThrower thrower(isolate, "");
   v8::WasmCompiledModule::SerializedModule data;
   {
     HandleScope scope(isolate);
-    WasmJs::SetupIsolateForWasm(isolate);
 
     ModuleResult decoding_result = DecodeWasmModule(
         isolate, &zone, buffer.begin(), buffer.end(), false, kWasmOrigin);
     std::unique_ptr<const WasmModule> module(decoding_result.val);
     CHECK(!decoding_result.failed());
 
     MaybeHandle<FixedArray> compiled_module =
         module->CompileFunctions(isolate, &thrower);
     CHECK(!compiled_module.is_null());
     Handle<JSObject> module_obj = CreateCompiledModuleObject(
@@ skipping 10 matching lines @@
   create_params.array_buffer_allocator =
       CcTest::InitIsolateOnce()->array_buffer_allocator();
 
   v8::Isolate* v8_isolate = v8::Isolate::New(create_params);
   {
     v8::Isolate::Scope isolate_scope(v8_isolate);
     v8::HandleScope new_scope(v8_isolate);
     v8::Local<v8::Context> new_ctx = v8::Context::New(v8_isolate);
     new_ctx->Enter();
     isolate = reinterpret_cast<Isolate*>(v8_isolate);
-    WasmJs::SetupIsolateForWasm(isolate);
+    testing::SetupIsolateForWasmModule(isolate);

[Mircea Trofin, 2016/09/16 07:13:00]

On line 240, we reassign isolate to the v8_isolate created on line 234. Since
isolate_setup_for_module == true, we won't initialize this new one. I'm not sure
we're fixing anything this way.

[gdeepti, 2016/09/16 07:37:21]

Can you elaborate what you mean by we won't initialize this new one? Doesn't
calling the SetupIsolateForWasmModule bypass the isolate_setup_for_module ==
true check?  Calling this method more than once for the same isolate is the case
I am attempting to fix.

 
     v8::MaybeLocal<v8::WasmCompiledModule> deserialized =
         v8::WasmCompiledModule::Deserialize(v8_isolate, data);
     v8::Local<v8::WasmCompiledModule> compiled_module;
     CHECK(deserialized.ToLocal(&compiled_module));
     Handle<JSObject> module_object =
         Handle<JSObject>::cast(v8::Utils::OpenHandle(*compiled_module));
     Handle<JSObject> instance =
         WasmModule::Instantiate(isolate, module_object,
                                 Handle<JSReceiver>::null(),
@@ skipping 33 matching lines @@
   WasmModuleBuilder* builder = new (&zone) WasmModuleBuilder(&zone);
   uint16_t f_index = builder->AddFunction();
   WasmFunctionBuilder* f = builder->FunctionAt(f_index);
   f->SetSignature(sigs.i_v());
   ExportAsMain(f);
   byte code[] = {WASM_IF_ELSE(WASM_I32V(0), WASM_GROW_MEMORY(WASM_I32V(1)),
                               WASM_I32V(12))};
   f->EmitCode(code, sizeof(code));
   TestModule(&zone, builder, 12);
 }