[wasm] Make wasm info available on the stack trace

src/frames.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_H_
 #define V8_FRAMES_H_
 
 #include "src/allocation.h"
 #include "src/handles.h"
 #include "src/safepoint-table.h"
@@ skipping 623 matching lines @@
 class JavaScriptFrame;
 
 class FrameSummary BASE_EMBEDDED {
  public:
   FrameSummary(Object* receiver, JSFunction* function,
                AbstractCode* abstract_code, int code_offset,
                bool is_constructor);
 
   static FrameSummary GetFirst(JavaScriptFrame* frame);
 
-  Handle<Object> receiver() { return receiver_; }
-  Handle<JSFunction> function() { return function_; }
-  Handle<AbstractCode> abstract_code() { return abstract_code_; }
-  int code_offset() { return code_offset_; }
-  bool is_constructor() { return is_constructor_; }
+  Handle<Object> receiver() const { return receiver_; }

[titzer, 2016/04/22 12:16:25]

AFAICT FrameSummary instances are already immutable, so the const modifier is
redundant (since all FrameSummary instances and references are implicitly const,
too).

[Clemens Hammacher, 2016/04/26 14:00:10]

Removed the const.

+  Handle<JSFunction> function() const { return function_; }
+  Handle<AbstractCode> abstract_code() const { return abstract_code_; }
+  int code_offset() const { return code_offset_; }
+  bool is_constructor() const { return is_constructor_; }
 
   void Print();
 
  private:
   Handle<Object> receiver_;
   Handle<JSFunction> function_;
   Handle<AbstractCode> abstract_code_;
   int code_offset_;
   bool is_constructor_;
 };
@@ skipping 11 matching lines @@
   inline void SetExpression(int index, Object* value);
   int ComputeExpressionsCount() const;
 
   void SetCallerFp(Address caller_fp) override;
 
   static StandardFrame* cast(StackFrame* frame) {
     DCHECK(frame->is_standard());
     return static_cast<StandardFrame*>(frame);
   }
 
-  // Build a list with summaries for this frame including all inlined frames.
-  virtual void Summarize(List<FrameSummary>* frames) const;
-
-  // Accessors.
-  virtual JSFunction* function() const;
-  virtual Object* receiver() const;
-
  protected:
   inline explicit StandardFrame(StackFrameIteratorBase* iterator);
 
   void ComputeCallerState(State* state) const override;
 
   // Accessors.
   inline Address caller_fp() const;
   inline Address caller_pc() const;
 
   // Computes the address of the PC field in the standard frame given
@@ skipping 24 matching lines @@
 
  private:
   friend class StackFrame;
   friend class SafeStackFrameIterator;
 };
 
 class JavaScriptFrame : public StandardFrame {
  public:
   Type type() const override { return JAVA_SCRIPT; }
 
-  JSFunction* function() const override;
-  Object* receiver() const override;
+  // Build a list with summaries for this frame including all inlined frames.
+  virtual void Summarize(List<FrameSummary>* frames) const;
+
+  // Accessors.
+  virtual JSFunction* function() const;
+  virtual Object* receiver() const;
 
   inline void set_receiver(Object* value);
 
   // Access the parameters.
   inline Address GetParameterSlot(int index) const;
   inline Object* GetParameter(int index) const;
   inline int ComputeParametersCount() const {
     return GetNumberOfIncomingArguments();
   }
 
@@ skipping 27 matching lines @@
   // Printing support.
   void Print(StringStream* accumulator, PrintMode mode,
              int index) const override;
 
   // Determine the code for the frame.
   Code* unchecked_code() const override;
 
   // Return a list with JSFunctions of this frame.
   virtual void GetFunctions(List<JSFunction*>* functions) const;
 
-  void Summarize(List<FrameSummary>* frames) const override;
-
   // Lookup exception handler for current {pc}, returns -1 if none found. Also
   // returns data associated with the handler site specific to the frame type:
   //  - JavaScriptFrame : Data is the stack depth at entry of the try-block.
   //  - OptimizedFrame  : Data is the stack slot count of the entire frame.
   //  - InterpretedFrame: Data is the register index holding the context.
   virtual int LookupExceptionHandlerInTable(
       int* data, HandlerTable::CatchPrediction* prediction);
 
   // Architecture-specific register description.
   static Register fp_register();
@@ skipping 161 matching lines @@
   // GC support.
   void Iterate(ObjectVisitor* v) const override;
 
   // Printing support.
   void Print(StringStream* accumulator, PrintMode mode,
              int index) const override;
 
   // Determine the code for the frame.
   Code* unchecked_code() const override;
 
+  Object* wasm_obj(Handle<Code> code = Handle<Code>());
+  uint32_t function_index(Handle<Code> code = Handle<Code>());
+
+  Object* function_name(Handle<Code> code = Handle<Code>());
+
   static WasmFrame* cast(StackFrame* frame) {
     DCHECK(frame->is_wasm());
     return static_cast<WasmFrame*>(frame);
   }
 
-  JSFunction* function() const override;
-
-  void Summarize(List<FrameSummary>* frames) const override;
-
  protected:
   inline explicit WasmFrame(StackFrameIteratorBase* iterator);
 
   Address GetCallerStackPointer() const override;
 
  private:
   friend class StackFrameIteratorBase;
 };
 
 class WasmToJsFrame : public StubFrame {
@@ skipping 229 matching lines @@
 
 
 // Reads all frames on the current stack and copies them into the current
 // zone memory.
 Vector<StackFrame*> CreateStackMap(Isolate* isolate, Zone* zone);
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_FRAMES_H_