[wasm] Improve naming consistency for WASM instances.

src/isolate.cc

 // Copyright 2012 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/isolate.h"
 
 #include <stdlib.h>
 
 #include <fstream>  // NOLINT(readability/streams)
 #include <sstream>
@@ skipping 492 matching lines @@
         if (helper.IsStrictFrame(*fun)) flags |= FrameArray::kIsStrict;
         if (exit_frame->IsConstructor()) flags |= FrameArray::kForceConstructor;
 
         elements = FrameArray::AppendJSFrame(elements, recv, fun,
                                              Handle<AbstractCode>::cast(code),
                                              offset, flags);
       } break;
 
       case StackFrame::WASM: {
         WasmFrame* wasm_frame = WasmFrame::cast(frame);
-        Handle<Object> wasm_object(wasm_frame->wasm_obj(), this);
+        Handle<Object> instance(wasm_frame->wasm_instance(), this);
         const int wasm_function_index = wasm_frame->function_index();
         Code* code = wasm_frame->unchecked_code();
         Handle<AbstractCode> abstract_code(AbstractCode::cast(code), this);
         const int offset =
             static_cast<int>(wasm_frame->pc() - code->instruction_start());
 
         // TODO(wasm): The wasm object returned by the WasmFrame should always
         //             be a wasm object.
-        DCHECK(wasm::IsWasmObject(*wasm_object) ||
-               wasm_object->IsUndefined(this));
+        DCHECK(wasm::IsWasmInstance(*instance) || instance->IsUndefined(this));
 
-        int flags = wasm::WasmIsAsmJs(*wasm_object, this)
+        int flags = wasm::WasmIsAsmJs(*instance, this)
                         ? FrameArray::kIsAsmJsWasmFrame
                         : FrameArray::kIsWasmFrame;
 
-        elements = FrameArray::AppendWasmFrame(elements, wasm_object,
-                                               wasm_function_index,
-                                               abstract_code, offset, flags);
+        elements =
+            FrameArray::AppendWasmFrame(elements, instance, wasm_function_index,
+                                        abstract_code, offset, flags);
       } break;
 
       default:
         break;
     }
   }
 
   elements->ShrinkToFit();
 
   // TODO(yangguo): Queue this structured stack trace for preprocessing on GC.
@@ skipping 153 matching lines @@
 
     return stack_frame;
   }
 
   Handle<JSObject> NewStackFrameObject(WasmFrame* frame) {
     Handle<JSObject> stack_frame =
         factory()->NewJSObject(isolate_->object_function());
 
     if (!function_key_.is_null()) {
       Handle<String> name = wasm::GetWasmFunctionName(
-          isolate_, handle(frame->wasm_obj(), isolate_),
+          isolate_, handle(frame->wasm_instance(), isolate_),
           frame->function_index());
       JSObject::AddProperty(stack_frame, function_key_, name, NONE);
     }
     // Encode the function index as line number.
     if (!line_key_.is_null()) {
       JSObject::AddProperty(
           stack_frame, line_key_,
           isolate_->factory()->NewNumberFromInt(frame->function_index()), NONE);
     }
     // Encode the byte offset as column.
@@ skipping 2749 matching lines @@
   // Then check whether this scope intercepts.
   if ((flag & intercept_mask_)) {
     intercepted_flags_ |= flag;
     return true;
   }
   return false;
 }
 
 }  // namespace internal
 }  // namespace v8