[wasm] Improve naming consistency for WASM instances.

src/messages.cc

 // Copyright 2011 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/messages.h"
 
 #include <memory>
 
 #include "src/api.h"
 #include "src/execution.h"
@@ skipping 605 matching lines @@
 
 Handle<Script> JSStackFrame::GetScript() const {
   return handle(Script::cast(function_->shared()->script()), isolate_);
 }
 
 void WasmStackFrame::FromFrameArray(Isolate* isolate, Handle<FrameArray> array,
                                     int frame_ix) {
   // This function is called for both wasm and asm.js->wasm frames.
   DCHECK(array->IsWasmFrame(frame_ix) || array->IsAsmJsWasmFrame(frame_ix));
   isolate_ = isolate;
-  wasm_obj_ = handle(array->WasmObject(frame_ix), isolate);
+  wasm_instance_ = handle(array->WasmInstance(frame_ix), isolate);
   wasm_func_index_ = array->WasmFunctionIndex(frame_ix)->value();
   code_ = handle(array->Code(frame_ix), isolate);
   offset_ = array->Offset(frame_ix)->value();
 }
 
 Handle<Object> WasmStackFrame::GetFunction() const {
   Handle<Object> obj(Smi::FromInt(wasm_func_index_), isolate_);
   return obj;
 }
 
 Handle<Object> WasmStackFrame::GetFunctionName() {
-  return wasm::GetWasmFunctionNameOrNull(isolate_, wasm_obj_, wasm_func_index_);
+  return wasm::GetWasmFunctionNameOrNull(isolate_, wasm_instance_,
+                                         wasm_func_index_);
 }
 
 MaybeHandle<String> WasmStackFrame::ToString() {
   IncrementalStringBuilder builder(isolate_);
 
   Handle<Object> name = GetFunctionName();
   if (name->IsNull(isolate_)) {
     builder.AppendCString("<WASM UNNAMED>");
   } else {
     DCHECK(name->IsString());
@@ skipping 26 matching lines @@
   return isolate_->global_proxy();
 }
 
 Handle<Object> AsmJsWasmStackFrame::GetFunction() const {
   // TODO(clemensh): Return lazily created JSFunction.
   return Null();
 }
 
 Handle<Object> AsmJsWasmStackFrame::GetFileName() {
   Handle<Script> script =
-      wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_obj_));
+      wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
   return handle(script->name(), isolate_);
 }
 
 Handle<Object> AsmJsWasmStackFrame::GetFunctionName() {
-  return wasm::GetWasmFunctionNameOrNull(isolate_, wasm_obj_, wasm_func_index_);
+  return wasm::GetWasmFunctionNameOrNull(isolate_, wasm_instance_,
+                                         wasm_func_index_);
 }
 
 Handle<Object> AsmJsWasmStackFrame::GetScriptNameOrSourceUrl() {
   Handle<Script> script =
-      wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_obj_));
+      wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
   return ScriptNameOrSourceUrl(script, isolate_);
 }
 
 int AsmJsWasmStackFrame::GetPosition() const {
   DCHECK_LE(0, offset_);
   int byte_offset = code_->SourcePosition(offset_);
-  return wasm::GetAsmWasmSourcePosition(Handle<JSObject>::cast(wasm_obj_),
+  return wasm::GetAsmWasmSourcePosition(Handle<JSObject>::cast(wasm_instance_),
                                         wasm_func_index_, byte_offset);
 }
 
 int AsmJsWasmStackFrame::GetLineNumber() {
   DCHECK_LE(0, GetPosition());
   Handle<Script> script =
-      wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_obj_));
+      wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
   return Script::GetLineNumber(script, GetPosition()) + 1;
 }
 
 int AsmJsWasmStackFrame::GetColumnNumber() {
   DCHECK_LE(0, GetPosition());
   Handle<Script> script =
-      wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_obj_));
+      wasm::GetAsmWasmScript(Handle<JSObject>::cast(wasm_instance_));
   return Script::GetColumnNumber(script, GetPosition()) + 1;
 }
 
 MaybeHandle<String> AsmJsWasmStackFrame::ToString() {
   // The string should look exactly as the respective javascript frame string.
   // Keep this method in line to JSStackFrame::ToString().
 
   IncrementalStringBuilder builder(isolate_);
 
   Handle<Object> function_name = GetFunctionName();
@@ skipping 451 matching lines @@
   DCHECK(mode != SKIP_UNTIL_SEEN);
 
   Handle<Object> no_caller;
   Handle<String> msg = FormatMessage(isolate, template_index, arg0, arg1, arg2);
   return ErrorUtils::Construct(isolate, constructor, constructor, msg, mode,
                                no_caller, false);
 }
 
 }  // namespace internal
 }  // namespace v8