Add WasmFrame, backtraces reflect wasm's presence

src/frames.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/frames.h"
 
 #include <sstream>
 
 #include "src/ast/ast.h"
 #include "src/ast/scopeinfo.h"
@@ skipping 116 matching lines @@
   switch (type) {
     case StackFrame::NONE: return NULL;
     STACK_FRAME_TYPE_LIST(FRAME_TYPE_CASE)
     default: break;
   }
   return NULL;
 
 #undef FRAME_TYPE_CASE
 }
 
-
-// -------------------------------------------------------------------------

[Michael Starzinger, 2016/02/23 09:36:25]

nit: Please bring back the separator comment.

[JF, 2016/02/23 16:00:53]

Done.

-
-
-JavaScriptFrameIterator::JavaScriptFrameIterator(
-    Isolate* isolate, StackFrame::Id id)
+JavaScriptFrameIterator::JavaScriptFrameIterator(Isolate* isolate,
+                                                 StackFrame::Id id)
     : iterator_(isolate) {
   while (!done()) {
     Advance();
     if (frame()->id() == id) return;
   }
 }
 
 
 void JavaScriptFrameIterator::Advance() {
   do {
@@ skipping 286 matching lines @@
 
   Object* marker =
       Memory::Object_at(state->fp + StandardFrameConstants::kMarkerOffset);
   if (code_obj != nullptr) {
     switch (code_obj->kind()) {
       case Code::FUNCTION:
         return JAVA_SCRIPT;
       case Code::OPTIMIZED_FUNCTION:
         return OPTIMIZED;
       case Code::WASM_FUNCTION:
-        return STUB;
+        return WASM;
       case Code::BUILTIN:
         if (!marker->IsSmi()) {
           if (StandardFrame::IsArgumentsAdaptorFrame(state->fp)) {
             // An adapter frame has a special SMI constant for the context and
             // is not distinguished through the marker.
             return ARGUMENTS_ADAPTOR;
           } else {
             // The interpreter entry trampoline has a non-SMI marker.
             DCHECK(code_obj->is_interpreter_entry_trampoline() ||
                    code_obj->is_interpreter_enter_bytecode_dispatch());
@@ skipping 755 matching lines @@
   return reinterpret_cast<Code*>(code);
 }
 
 
 void StackFrame::PrintIndex(StringStream* accumulator,
                             PrintMode mode,
                             int index) {
   accumulator->Add((mode == OVERVIEW) ? "%5d: " : "[%d]: ", index);
 }
 
+void WasmFrame::Print(StringStream* accumulator, PrintMode mode,
+                      int index) const {}

[Michael Starzinger, 2016/02/23 09:36:25]

nit: Can we print something here? Just one single line saying "Wasm frame" or
something like would be fine. It would just be nice to not have it silently fly
under the radar during debugging.

[JF, 2016/02/23 16:00:53]

Done.

+
+Code* WasmFrame::unchecked_code() const {
+  return static_cast<Code*>(isolate()->FindCodeObject(pc()));
+}
+
+void WasmFrame::Iterate(ObjectVisitor* v) const { IterateCompiledFrame(v); }
+
+Address WasmFrame::GetCallerStackPointer() const {
+  return fp() + ExitFrameConstants::kCallerSPDisplacement;
+}
 
 namespace {
 
 
 void PrintFunctionSource(StringStream* accumulator, SharedFunctionInfo* shared,
                          Code* code) {
   if (FLAG_max_stack_trace_source_length != 0 && code != NULL) {
     std::ostringstream os;
     os << "--------- s o u r c e   c o d e ---------\n"
        << SourceCodeOf(shared, FLAG_max_stack_trace_source_length)
@@ skipping 411 matching lines @@
   for (StackFrameIterator it(isolate); !it.done(); it.Advance()) {
     StackFrame* frame = AllocateFrameCopy(it.frame(), zone);
     list.Add(frame, zone);
   }
   return list.ToVector();
 }
 
 
 }  // namespace internal
 }  // namespace v8