[wasm] Improve naming consistency for WASM instances.

src/wasm/wasm-debug.cc

 // Copyright 2016 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/wasm/wasm-debug.h"
 
 #include "src/assert-scope.h"
 #include "src/debug/debug.h"
 #include "src/factory.h"
 #include "src/isolate.h"
@@ skipping 14 matching lines @@
   kWasmDebugInfoNumEntries
 };
 
 ByteArray *GetOrCreateFunctionOffsetTable(Handle<WasmDebugInfo> debug_info) {
   Object *offset_table = debug_info->get(kWasmDebugInfoFunctionByteOffsets);
   Isolate *isolate = debug_info->GetIsolate();
   if (!offset_table->IsUndefined(isolate)) return ByteArray::cast(offset_table);
 
   FunctionOffsetsResult function_offsets;
   {
-    Handle<JSObject> wasm_object(debug_info->wasm_object(), isolate);
+    Handle<JSObject> wasm_instance(debug_info->wasm_instance(), isolate);
     uint32_t num_imported_functions =
-        static_cast<uint32_t>(wasm::GetNumImportedFunctions(wasm_object));
-    Handle<SeqOneByteString> wasm_bytes = wasm::GetWasmBytes(wasm_object);
+        static_cast<uint32_t>(wasm::GetNumImportedFunctions(wasm_instance));
+    Handle<SeqOneByteString> wasm_bytes = wasm::GetWasmBytes(wasm_instance);
     DisallowHeapAllocation no_gc;
     const byte *bytes_start = wasm_bytes->GetChars();
     const byte *bytes_end = bytes_start + wasm_bytes->length();
     function_offsets = wasm::DecodeWasmFunctionOffsets(bytes_start, bytes_end,
                                                        num_imported_functions);
   }
   DCHECK(function_offsets.ok());
   size_t array_size = 2 * kIntSize * function_offsets.val.size();
   CHECK_LE(array_size, static_cast<size_t>(kMaxInt));
   ByteArray *arr =
@@ skipping 16 matching lines @@
 
   int offset = arr->get_int(2 * func_index);
   int length = arr->get_int(2 * func_index + 1);
   // Assert that it's distinguishable from the "illegal function index" return.
   DCHECK(offset > 0 && length > 0);
   return {offset, length};
 }
 
 Vector<const uint8_t> GetFunctionBytes(Handle<WasmDebugInfo> debug_info,
                                        int func_index) {
-  Handle<JSObject> wasm_object(debug_info->wasm_object());
-  Handle<SeqOneByteString> module_bytes = wasm::GetWasmBytes(wasm_object);
+  Handle<JSObject> wasm_instance(debug_info->wasm_instance());
+  Handle<SeqOneByteString> module_bytes = wasm::GetWasmBytes(wasm_instance);
   std::pair<int, int> offset_and_length =
       GetFunctionOffsetAndLength(debug_info, func_index);
   return Vector<const uint8_t>(
       module_bytes->GetChars() + offset_and_length.first,
       offset_and_length.second);
 }
 
 FixedArray *GetOffsetTables(Handle<WasmDebugInfo> debug_info,
                             Isolate *isolate) {
   Object *offset_tables = debug_info->get(kWasmDebugInfoAsmJsOffsets);
   if (!offset_tables->IsUndefined(isolate)) {
     return FixedArray::cast(offset_tables);
   }
 
   AsmJsOffsetsResult asm_offsets;
   {
-    Handle<JSObject> wasm_object(debug_info->wasm_object(), isolate);
+    Handle<JSObject> wasm_instance(debug_info->wasm_instance(), isolate);
     Handle<WasmCompiledModule> compiled_module =
-        handle(GetCompiledModule(*wasm_object), isolate);
+        handle(GetCompiledModule(*wasm_instance), isolate);
     DCHECK(compiled_module->has_asm_js_offset_tables());
     Handle<ByteArray> asm_offset_tables =
         compiled_module->asm_js_offset_tables();
     uint32_t num_imported_functions =
-        static_cast<uint32_t>(wasm::GetNumImportedFunctions(wasm_object));
+        static_cast<uint32_t>(wasm::GetNumImportedFunctions(wasm_instance));
     DisallowHeapAllocation no_gc;
     const byte *bytes_start = asm_offset_tables->GetDataStartAddress();
     const byte *bytes_end = bytes_start + asm_offset_tables->length();
     asm_offsets = wasm::DecodeAsmJsOffsets(bytes_start, bytes_end,
                                            num_imported_functions);
   }
   // Wasm bytes must be valid and must contain asm.js offset table.
   DCHECK(asm_offsets.ok());
   DCHECK_GE(static_cast<size_t>(kMaxInt), asm_offsets.val.size());
   int num_functions = static_cast<int>(asm_offsets.val.size());
-  DCHECK_EQ(wasm::GetNumberOfFunctions(handle(debug_info->wasm_object())),
+  DCHECK_EQ(wasm::GetNumberOfFunctions(handle(debug_info->wasm_instance())),
             num_functions);
   Handle<FixedArray> all_tables =
       isolate->factory()->NewFixedArray(num_functions);
   debug_info->set(kWasmDebugInfoAsmJsOffsets, *all_tables);
   for (int func = 0; func < num_functions; ++func) {
     std::vector<std::pair<int, int>> &func_asm_offsets = asm_offsets.val[func];
     if (func_asm_offsets.empty()) continue;
     size_t array_size = 2 * kIntSize * func_asm_offsets.size();
     CHECK_LE(array_size, static_cast<size_t>(kMaxInt));
     ByteArray *arr =
@@ skipping 29 matching lines @@
   arr->set(kWasmDebugInfoWasmBytesHash, *hash_obj);
 
   return Handle<WasmDebugInfo>::cast(arr);
 }
 
 bool WasmDebugInfo::IsDebugInfo(Object *object) {
   if (!object->IsFixedArray()) return false;
   FixedArray *arr = FixedArray::cast(object);
   Isolate *isolate = arr->GetIsolate();
   return arr->length() == kWasmDebugInfoNumEntries &&
-         IsWasmObject(arr->get(kWasmDebugInfoWasmObj)) &&
+         IsWasmInstance(arr->get(kWasmDebugInfoWasmObj)) &&
          arr->get(kWasmDebugInfoWasmBytesHash)->IsNumber() &&
          (arr->get(kWasmDebugInfoFunctionByteOffsets)->IsUndefined(isolate) ||
           arr->get(kWasmDebugInfoFunctionByteOffsets)->IsByteArray()) &&
          (arr->get(kWasmDebugInfoFunctionScripts)->IsUndefined(isolate) ||
           arr->get(kWasmDebugInfoFunctionScripts)->IsFixedArray());
 }
 
 WasmDebugInfo *WasmDebugInfo::cast(Object *object) {
   DCHECK(IsDebugInfo(object));
   return reinterpret_cast<WasmDebugInfo *>(object);
 }
 
-JSObject *WasmDebugInfo::wasm_object() {
+JSObject *WasmDebugInfo::wasm_instance() {
   return JSObject::cast(get(kWasmDebugInfoWasmObj));
 }
 
 Script *WasmDebugInfo::GetFunctionScript(Handle<WasmDebugInfo> debug_info,
                                          int func_index) {
   Isolate *isolate = debug_info->GetIsolate();
   Object *scripts_obj = debug_info->get(kWasmDebugInfoFunctionScripts);
   Handle<FixedArray> scripts;
   if (scripts_obj->IsUndefined(isolate)) {
-    Handle<JSObject> wasm_object(debug_info->wasm_object(), isolate);
-    int num_functions = wasm::GetNumberOfFunctions(wasm_object);
+    Handle<JSObject> wasm_instance(debug_info->wasm_instance(), isolate);
+    int num_functions = wasm::GetNumberOfFunctions(wasm_instance);
     scripts = isolate->factory()->NewFixedArray(num_functions, TENURED);
     debug_info->set(kWasmDebugInfoFunctionScripts, *scripts);
   } else {
     scripts = handle(FixedArray::cast(scripts_obj), isolate);
   }
 
   DCHECK(func_index >= 0 && func_index < scripts->length());
   Object *script_or_undef = scripts->get(func_index);
   if (!script_or_undef->IsUndefined(isolate)) {
     return Script::cast(script_or_undef);
   }
 
   Handle<Script> script =
       isolate->factory()->NewScript(isolate->factory()->empty_string());
   scripts->set(func_index, *script);
 
   script->set_type(Script::TYPE_WASM);
-  script->set_wasm_object(debug_info->wasm_object());
+  script->set_wasm_instance(debug_info->wasm_instance());
   script->set_wasm_function_index(func_index);
 
   int hash = 0;
   debug_info->get(kWasmDebugInfoWasmBytesHash)->ToInt32(&hash);
   char buffer[32];
   SNPrintF(ArrayVector(buffer), "wasm://%08x/%d", hash, func_index);
   Handle<String> source_url =
       isolate->factory()->NewStringFromAsciiChecked(buffer, TENURED);
   script->set_source_url(*source_url);
 
@@ skipping 93 matching lines @@
       left = mid;
     } else {
       right = mid;
     }
   }
   // There should be an entry for each position that could show up on the stack
   // trace:
   DCHECK_EQ(byte_offset, offset_table->get_int(2 * left));
   return offset_table->get_int(2 * left + 1);
 }