Prepare StackFrame hierarchy & iterators for WASM

src/frames-inl.h

 // 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.
 
 #ifndef V8_FRAMES_INL_H_
 #define V8_FRAMES_INL_H_
 
 #include "src/frames.h"
 #include "src/isolate.h"
 #include "src/objects-inl.h"
@@ skipping 181 matching lines @@
   // Base points to low address of first operand and stack grows down, so add
   // kPointerSize to get the actual stack size.
   intptr_t stack_size_in_bytes = (base + kPointerSize) - sp();
   DCHECK(IsAligned(stack_size_in_bytes, kPointerSize));
   DCHECK(type() == JAVA_SCRIPT);
   DCHECK(stack_size_in_bytes >= 0);
   return static_cast<int>(stack_size_in_bytes >> kPointerSizeLog2);
 }
 
 
-inline Object* JavaScriptFrame::receiver() const {
-  return GetParameter(-1);
-}
-
-
 inline void JavaScriptFrame::set_receiver(Object* value) {
   Memory::Object_at(GetParameterSlot(-1)) = value;
 }
 
 
 inline bool JavaScriptFrame::has_adapted_arguments() const {
   return IsArgumentsAdaptorFrame(caller_fp());
 }
 
 
-inline JSFunction* JavaScriptFrame::function() const {
-  return JSFunction::cast(function_slot_object());
-}
-
-
 inline Object* JavaScriptFrame::function_slot_object() const {
   const int offset = JavaScriptFrameConstants::kFunctionOffset;
   return Memory::Object_at(fp() + offset);
 }
 
 
 inline StubFrame::StubFrame(StackFrameIteratorBase* iterator)
     : StandardFrame(iterator) {
 }
 
@@ skipping 49 matching lines @@
 inline JavaScriptFrame* JavaScriptFrameIterator::frame() const {
   // TODO(1233797): The frame hierarchy needs to change. It's
   // problematic that we can't use the safe-cast operator to cast to
   // the JavaScript frame type, because we may encounter arguments
   // adaptor frames.
   StackFrame* frame = iterator_.frame();
   DCHECK(frame->is_java_script() || frame->is_arguments_adaptor());
   return static_cast<JavaScriptFrame*>(frame);
 }
 
+inline StandardFrame* StackTraceFrameIterator::frame() const {
+  StackFrame* frame = iterator_.frame();
+  DCHECK(frame->is_java_script() || frame->is_arguments_adaptor() ||
+         frame->is_wasm());
+  return static_cast<StandardFrame*>(frame);
+}
+
+bool StackTraceFrameIterator::isJS() const { return frame()->is_java_script(); }

[titzer, 2016/04/06 09:53:23]

Spell out JavaScript here.

[Clemens Hammacher, 2016/04/06 10:18:28]

OK, changed it to is_javascript.

+
+bool StackTraceFrameIterator::isWasm() const { return frame()->is_wasm(); }
+
+JavaScriptFrame* StackTraceFrameIterator::jsFrame() const {

[titzer, 2016/04/06 09:53:22]

CamelCase doesn't quite fit the surrounding style here, so I suggest
javascript_frame() for this and wasm_frame() for the one below.

[Clemens Hammacher, 2016/04/06 10:18:28]

Done.

+  DCHECK(isJS());
+  return static_cast<JavaScriptFrame*>(frame());
+}
+
+WasmFrame* StackTraceFrameIterator::wasmFrame() const {
+  DCHECK(isWasm());
+  return static_cast<WasmFrame*>(frame());
+}
 
 inline StackFrame* SafeStackFrameIterator::frame() const {
   DCHECK(!done());
   DCHECK(frame_->is_java_script() || frame_->is_exit());
   return frame_;
 }
 
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_FRAMES_INL_H_